Commit graph

16170 commits

Author SHA1 Message Date
97fd47c614 Moved include to top 2017-06-07 08:46:38 +00:00
1c107b2e1f Merge pull request #1 from friendica/develop
Update develop branch
2017-06-07 15:06:13 +07:00
66458d7313 Merge pull request #3522 from annando/1706-lock
Some more poller speed and lock functionality
2017-06-07 09:29:54 +02:00
Michael Vogel
89efc7dd13 Merge pull request #3524 from tobiasd/20170607-missingdash
added missing dash in version
2017-06-07 08:29:36 +02:00
2ad784d37a Speeded up calling "proc_run" 2017-06-07 05:42:30 +00:00
36630daca6 added missing dash in version 2017-06-07 07:36:04 +02:00
6161ceff64 Merge remote-tracking branch 'upstream/develop' into 1706-lock 2017-06-07 05:28:37 +00:00
Hypolite Petovan
37a74c993b Merge pull request #3521 from annando/1705-dbclean-advanced
Expire remote items
2017-06-06 23:43:40 -04:00
737e40b4d9 Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock 2017-06-06 22:20:05 +00:00
9c46971aa5 The check for blocking processes is deactivated until further checks were performed 2017-06-06 22:18:42 +00:00
6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
4e748668c6 Spaces 2017-06-06 20:10:47 +00:00
932e14971f Issue 2864: Add a "alternate" link on display page 2017-06-06 17:56:22 +00:00
910cca0629 Attached pictures in OStatus posts are now displayed 2017-06-06 17:55:14 +00:00
e3d5dcf049 Beware of camels 2017-06-06 17:42:47 +00:00
611d3e3f5d Added documentation 2017-06-06 17:41:01 +00:00
929f518e5c Added documentation 2017-06-06 17:38:58 +00:00
de9cddc82f Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced 2017-06-06 17:30:40 +00:00
286b2da7a9 Added documentation and renamed function 2017-06-06 17:25:28 +00:00
Michael Vogel
f4652d6e50 Merge branch 'develop' into 1706-lock 2017-06-06 14:16:00 +02:00
f96423feae Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock 2017-06-06 12:12:07 +00:00
8d13751d40 Increased database version 2017-06-06 12:07:27 +00:00
e00105d649 Don't fork a new worker 2017-06-06 11:59:38 +00:00
7fb4b1be12 Friendica version 3.5.3dev 2017-06-06 12:22:06 +02:00
f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
e3f60fe706 Friendica version 3.5.2 2017-06-06 12:18:29 +02:00
02f9bfa54a Merge pull request #3486 from tobiasd/3.5.2-CHANGELOG
Updating the CHANGELOG
2017-06-06 12:16:22 +02:00
796efa119f Merge pull request #3520 from AndyHee/3.5.2rc
Correcting path for en-gb and en-gb translations core
2017-06-06 09:27:25 +02:00
b59ca39d32 Rename view/lang/en-US/strings.php to view/lang/en-us/strings.php 2017-06-06 13:00:20 +07:00
0322ed4dbc Rename view/lang/en-US/messages.po to view/lang/en-us/messages.po 2017-06-06 12:58:59 +07:00
2529552809 Rename view/lang/en-GB/strings.php to view/lang/en-gb/strings.php 2017-06-06 12:58:20 +07:00
a0b0e38c28 Rename view/lang/en-GB/messages.po to view/lang/en-gb/messages.po 2017-06-06 12:57:08 +07:00
Michael Vogel
717ac8ca81 Merge pull request #3519 from tobiasd/20170606-es
ES translation THX Albert
2017-06-06 07:47:18 +02:00
02ee64b9b8 there can only be one annando 2017-06-06 07:22:28 +02:00
11e17a3512 improved compatibility to MySQL version 5.7 for the CHANGELOG 2017-06-06 07:20:37 +02:00
cdc0eab49d ES translation THX Albert 2017-06-06 07:11:27 +02:00
a98e1e5590 Merge pull request #3490 from tobiasd/20170524-credits
regen credits
2017-06-06 07:00:02 +02:00
2b7f9b4d2d added EN-US to the translation list 2017-06-06 06:57:46 +02:00
af41e5ed83 Merge pull request #3518 from AndyHee/3.5.2rc
Update EN-GB Translation Core + Create EN-US Translation core
2017-06-06 06:56:02 +02:00
5dfa513b62 Only wait when you have a timout value at all 2017-06-06 04:22:18 +00:00
ba7b4fddea memory check is now also only done once in a while 2017-06-06 04:00:24 +00:00
2b04865cdb We found the handbrake ... 2017-06-05 22:41:33 +00:00
2bff8e302a Removing the lock after the process was removed is better 2017-06-05 16:56:21 +00:00
379a01a1c5 Update messages.po 2017-06-05 22:22:16 +07:00
098ef3de99 Create strings.php 2017-06-05 22:21:31 +07:00
a7403349bc Create messages.po 2017-06-05 22:20:27 +07:00
b86c4d539e Locking waits now for a shorter period. DB locking is used at other locations as well 2017-06-05 14:59:53 +00:00
757bf75493 Update strings.php 2017-06-05 21:37:56 +07:00
887e309e85 Update messages.po 2017-06-05 21:36:26 +07:00
291c7050e9 it is June, and some additions 2017-06-05 08:50:37 +02:00