Commit graph

15461 commits

Author SHA1 Message Date
Michael 97fd47c614 Moved include to top 2017-06-07 08:46:38 +00:00
Michael 6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
Michael 932e14971f Issue 2864: Add a "alternate" link on display page 2017-06-06 17:56:22 +00:00
Tobias Diekershoff 7fb4b1be12 Friendica version 3.5.3dev 2017-06-06 12:22:06 +02:00
Tobias Diekershoff f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
Tobias Diekershoff e3f60fe706 Friendica version 3.5.2 2017-06-06 12:18:29 +02:00
Tobias Diekershoff 02f9bfa54a Merge pull request #3486 from tobiasd/3.5.2-CHANGELOG
Updating the CHANGELOG
2017-06-06 12:16:22 +02:00
Tobias Diekershoff 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
Andy H b59ca39d32 Rename view/lang/en-US/strings.php to view/lang/en-us/strings.php 2017-06-06 13:00:20 +07:00
Andy H 0322ed4dbc Rename view/lang/en-US/messages.po to view/lang/en-us/messages.po 2017-06-06 12:58:59 +07:00
Andy H 2529552809 Rename view/lang/en-GB/strings.php to view/lang/en-gb/strings.php 2017-06-06 12:58:20 +07:00
Andy H 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
Tobias Diekershoff 02ee64b9b8 there can only be one annando 2017-06-06 07:22:28 +02:00
Tobias Diekershoff 11e17a3512 improved compatibility to MySQL version 5.7 for the CHANGELOG 2017-06-06 07:20:37 +02:00
Tobias Diekershoff cdc0eab49d ES translation THX Albert 2017-06-06 07:11:27 +02:00
Tobias Diekershoff a98e1e5590 Merge pull request #3490 from tobiasd/20170524-credits
regen credits
2017-06-06 07:00:02 +02:00
Tobias Diekershoff 2b7f9b4d2d added EN-US to the translation list 2017-06-06 06:57:46 +02:00
Tobias Diekershoff 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
Andy H 379a01a1c5 Update messages.po 2017-06-05 22:22:16 +07:00
Andy H 098ef3de99 Create strings.php 2017-06-05 22:21:31 +07:00
Andy H a7403349bc Create messages.po 2017-06-05 22:20:27 +07:00
Andy H 757bf75493 Update strings.php 2017-06-05 21:37:56 +07:00
Andy H 887e309e85 Update messages.po 2017-06-05 21:36:26 +07:00
Tobias Diekershoff 291c7050e9 it is June, and some additions 2017-06-05 08:50:37 +02:00
Tobias Diekershoff acb3d9de3d Merge pull request #3517 from annando/bugfix-curl
CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions
2017-06-04 20:06:05 +02:00
Michael ad53a03f83 It should be "e" not "p" 2017-06-04 09:00:07 +00:00
Michael 945d3cc048 The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions 2017-06-03 19:46:19 +00:00
Tobias Diekershoff ec5a3c3440 Merge pull request #3514 from annando/worker-locking
Fixed locking behaviour for the worker
2017-06-03 11:02:50 +02:00
Michael 21eb9a4b2e Fixed locking behaviour for the worker 2017-06-03 07:25:01 +00:00
Michael Vogel 045d7d353f Merge pull request #3513 from Hypolite/bug/update-directory-url
Update remaining "dir.friendi.ca" instances
2017-06-03 08:01:04 +02:00
Hypolite Petovan cbd3edbc05 Update remaining "dir.friendi.ca" instances 2017-06-02 22:15:43 -04:00
Michael Vogel 54a805b5ae Merge pull request #3509 from rabuzarus/20170531_-_fix_notifications_intros
Bugfix: don't probe for introduction if it is not necessary
2017-06-01 14:57:09 +02:00
rabuzarus 8806688d68 restructure the conditions if gnetwork and gaddr is empty 2017-06-01 12:47:47 +02:00
rabuzarus a726056c5f use get_contact_details_by_url() instead of Probe:uri() 2017-06-01 11:44:59 +02:00
rabuzarus 8311af3e92 use Probe:uri() instead of probe_url 2017-05-31 18:43:57 +02:00
rabuzarus df7acc7655 Bugfix: don't probe for introduction if it is not necessary 2017-05-31 14:29:33 +02:00
rabuzarus 12cb5a6848 Merge pull request #3505 from annando/1705-probe-timeout
Better handling of timeout issues while probing
2017-05-31 13:07:23 +02:00
Michael Vogel 90904b42ed Merge pull request #3508 from gerhard6380/patch-1
corrected change
2017-05-31 11:03:28 +02:00
gerhard6380 1a0e8723c5 corrected change
sorry, I should not change code late in the evening when I am already tired.
2017-05-31 10:33:35 +02:00
Michael 609649557b Better handling of timeout issues while probing 2017-05-31 03:46:43 +00:00
Hypolite Petovan 66c6c37921 Merge pull request #3504 from gerhard6380/patch-1
API: link to original page for feed posts
2017-05-30 22:20:14 -04:00
gerhard6380 bbddea03e9 API: link to original page for feed posts
link to original page added to html output of feed posts if body is empty
2017-05-31 02:24:09 +02:00
Hypolite Petovan e5ff4a8463 Merge pull request #3503 from annando/1705-bugfix-poller
Bugfix: The poller often couldn't store the pid in the workerqueue
2017-05-30 14:18:15 -04:00
Michael f6d10198cc Bugfix: The poller often couldn't store the pid in the workerqueue 2017-05-30 13:20:29 +00:00
Tobias Diekershoff 62a7c8ed67 Merge pull request #3502 from annando/1705-self-probing
Don't quit if the own host cannot be reached via SSL
2017-05-29 21:40:50 +02:00
Michael a32de855cc Don't quit if the own host cannot be reached via SSL 2017-05-29 19:14:44 +00:00
Tobias Diekershoff 47bd3243cd Merge pull request #3500 from AndyHee/3.5.2rc
Update EN-GB translation core
2017-05-29 11:18:42 +02:00
Andy H 29560a3d06 Update strings.php 2017-05-29 15:36:12 +07:00
Andy H 3e68feb315 Update messages.po 2017-05-29 15:35:04 +07:00