Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 15:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
18510 commits 3 branches 64 tags 246 MiB
Commit graph

18510 commits

This branch
This branch
All branches
Author SHA1 Message Date
rabuzarus
2ac3db7607 Merge pull request #3768 from annando/avoid-sql-error 
Avoid SQL error when in Forum view
 2017-10-07 23:58:15 +02:00
Michael
ecce105ae8 Avoid SQL error when in Forum view 2017-10-07 21:51:03 +00:00
rabuzarus
829e8ca946 Merge pull request #3767 from annando/bugfix-search 
Bugfix: Wrong function in search
 2017-10-07 22:39:33 +02:00
Michael
68c6788762 Bugfix: Wrong function in search 2017-10-07 19:51:49 +00:00
rabuzarus
22f4e3973e Merge pull request #3766 from annando/trim-feed 
Feeds are now trimmed before importing
 2017-10-07 20:40:33 +02:00
Michael
67e57a83df Feeds are now trimmed before importing 2017-10-07 18:35:10 +00:00
Tobias Diekershoff
ef6a9e953a Merge pull request #3765 from annando/resend-frio 
Frio: Relocate message wasn't send
 2017-10-07 16:00:21 +00:00
Michael
df1e96441e Frio: Relocate message wasn't send 2017-10-07 15:45:00 +00:00
Tobias Diekershoff
0f1b27db1e Merge pull request #3764 from annando/contact-blocked 
Preparation for the possibility to globally block contacts
 2017-10-07 13:10:39 +00:00
Michael
c6dbbe21b4 Preparation for the possibility to globally block contacts 2017-10-07 09:52:43 +00:00
Tobias Diekershoff
cc9074bed5 Merge pull request #3763 from annando/relocation-addr 
Fixes the not changed "addr" entry when an account is imported
 2017-10-07 06:01:16 +00:00
Michael
ceb0dda486 Fixes the not changed "addr" entry when an account is imported 2017-10-07 05:20:46 +00:00
Tobias Diekershoff
072bf7d13d Merge pull request #3762 from annando/avoid-sql-error 
Fix SQL error when changing the SSL paths
 2017-10-06 23:30:11 +00:00
Michael
1870f942d3 Fix SQL error when changing the SSL paths 2017-10-06 19:25:04 +00:00
Tobias Diekershoff
10089c6e4e Merge pull request #3760 from friendica/revert-3743-task/update-languagedetect 
Revert "Update languagedetect library"
 2017-10-05 12:59:26 +00:00
Michael Vogel
dd57550fe7 Merge pull request #3759 from tobiasd/20171005-en 
update EN US and GB variations
 2017-10-05 14:24:37 +02:00
Tobias Diekershoff
95e8daa4c8 update EN US and GB variations 2017-10-05 14:09:52 +02:00
Michael Vogel
d38f58fd78 Merge pull request #3758 from tobiasd/20171005-vagrant 
give the admin user the admin panel in the Vagrant VM
 2017-10-05 13:04:34 +02:00
Tobias Diekershoff
97347692ac give the admin user the admin panel in the Vagrant VM 2017-10-05 12:58:53 +02:00
Tobias Diekershoff
071946fa78 Revert "Update languagedetect library" 2017-10-05 11:58:18 +02:00
Tobias Diekershoff
c22920edba Merge pull request #3743 from MrPetovan/task/update-languagedetect 
Update languagedetect library
 2017-10-05 08:49:17 +00:00
Tobias Diekershoff
54e1585c22 set version to 3.6-dev 2017-10-05 10:07:21 +02:00
Tobias Diekershoff
12b37ac596 Friendica Version 3.5.3 2017-10-05 10:05:01 +02:00
Tobias Diekershoff
339f922652 revert unwanted (?) changes 2017-10-05 10:02:06 +02:00
Tobias Diekershoff
4bf6ffb749 Merge pull request #3755 from tobiasd/CHANGELOG-3.5.5 
Changelog 3.5.3
 2017-10-05 08:00:27 +00:00
Tobias Diekershoff
15216d3c34 release date 2017-10-05 09:57:32 +02:00
Tobias Diekershoff
5039d87ba7 work on Vagrant 2017-10-05 09:57:04 +02:00
Tobias Diekershoff
2bcd5b3243 Merge pull request #3757 from silke/develop 
Develop
 2017-10-05 07:55:00 +00:00
Silke Meyer
56bfb0f45a Updated MySQL and PHP requirements in documentation 2017-10-04 21:57:49 +02:00
Silke Meyer
ab87f1215a Merge remote-tracking branch 'upstream/develop' into develop 2017-10-04 21:28:35 +02:00
Silke Meyer
eadeb3ed21 Fixed settings for test mysql database and updated documentation 2017-10-04 20:25:15 +02:00
Tobias Diekershoff
f04c84ac32 typos 2017-10-04 08:47:39 +02:00
Tobias Diekershoff
7d3c51216f issue closed 2017-10-04 07:56:50 +02:00
Tobias Diekershoff
098eba9256 Merge pull request #3756 from annando/ostatus-blocked 
Better handling of blocked contacts in OStatus
 2017-10-04 05:00:49 +00:00
Michael
a8a7f4a76d Better handling of blocked contacts in OStatus 2017-10-03 20:52:24 +00:00
Michael Vogel
ef55b7160e Merge pull request #3754 from tobiasd/20171003-de 
DE and ZH-CN translation
 2017-10-03 20:17:59 +02:00
Tobias Diekershoff
262c4d1836 some translation, release month, recent changes 2017-10-03 06:42:12 +02:00
Tobias Diekershoff
6440297895 update ZH-CN translation thx mytbk 2017-10-03 06:35:45 +02:00
Tobias Diekershoff
57f65a20a6 update DE translation 2017-10-03 06:29:15 +02:00
Tobias Diekershoff
1470e8e747 Merge pull request #3753 from annando/diaspora-reshare 
Diaspora: Reshares of reshares sometimes had problems
 2017-10-02 21:45:40 +02:00
Michael
c33aa2ccee Diaspora: Reshares of reshares sometimes had problems 2017-10-02 19:00:33 +00:00
Michael Vogel
a6f359190f Merge pull request #3752 from tobiasd/20171002-zhcn 
update ZH-CN translation thx mytbk
 2017-10-02 19:19:15 +02:00
Tobias Diekershoff
dcc9e16d50 update ZH-CN translation 2017-10-02 18:08:21 +02:00
Michael Vogel
cde1d91b2e Merge pull request #3751 from tobiasd/201709´1001-messages 
regenerated master messages.po file
 2017-10-01 09:14:58 +02:00
Tobias Diekershoff
59b8b7dbee regenerated master messages.po file 2017-10-01 08:56:06 +02:00
Tobias Diekershoff
8f02bcbda8 Merge pull request #3750 from annando/mail-guid 
Detect the hostname when the URI is in the format data@host.tld
 2017-10-01 02:07:18 +02:00
Michael
fffc360c6a Detect the hostname when the URI is in the format data@host.tld 2017-09-30 21:39:32 +00:00
Tobias Diekershoff
5a77f7c326 Merge pull request #3749 from annando/poller-db-update 
DB Structure call is now executed directly when it cannot be called via proc_run
 2017-09-30 19:49:44 +02:00
Michael
3354f01ed5 Doxygen and bugfix 2017-09-30 17:42:03 +00:00
Michael
2971501f63 The direct structure call is now only executed when called via the poller.php 2017-09-30 17:12:27 +00:00