Commit graph

15911 commits

Author SHA1 Message Date
ad53a03f83 It should be "e" not "p" 2017-06-04 09:00:07 +00:00
5de03c1b27 Locks now work - ready to be used in the wild 2017-06-04 08:36:08 +00:00
32f61016d3 Overhauled "lock" functionality 2017-06-04 07:26:21 +00:00
945d3cc048 The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions 2017-06-03 19:46:19 +00:00
ec5a3c3440 Merge pull request #3514 from annando/worker-locking
Fixed locking behaviour for the worker
2017-06-03 11:02:50 +02:00
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
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
81c87885cf Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-30 21:07:28 +00: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
f6d10198cc Bugfix: The poller often couldn't store the pid in the workerqueue 2017-05-30 13:20:29 +00:00
c9ea18ce74 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-29 20:54:43 +00:00
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
a32de855cc Don't quit if the own host cannot be reached via SSL 2017-05-29 19:14:44 +00:00
47bd3243cd Merge pull request #3500 from AndyHee/3.5.2rc
Update EN-GB translation core
2017-05-29 11:18:42 +02:00
29560a3d06 Update strings.php 2017-05-29 15:36:12 +07:00
3e68feb315 Update messages.po 2017-05-29 15:35:04 +07:00
Hypolite Petovan
4e51c341e8 Merge pull request #3499 from tobiasd/20170529-de
DE translations
2017-05-29 02:34:58 -04:00
67ae517406 DE translations 2017-05-29 07:21:42 +02:00
Hypolite Petovan
83bc1c7f4c Merge pull request #3498 from tobiasd/20170528-messages
regenerated master messages.po file
2017-05-28 13:04:55 -04:00
6c096f4ebd regenerated master messages.po file 2017-05-28 11:10:48 +02:00
f3c3c57a0e Merge pull request #3497 from annando/1705-dbstructure-admin-page
The database structure is now checked ad the admin summary page
2017-05-28 11:07:45 +02:00
104acec09c The database structure is now checked ad the admin summary page 2017-05-28 08:39:41 +00:00
62891d8de9 Merge pull request #3496 from annando/1705-more-logging
Some more logging for the probing
2017-05-28 08:10:03 +02:00
860887557a Some more logging for the probing 2017-05-28 05:38:12 +00:00
Michael Vogel
ad18e121ff Merge pull request #3495 from Hypolite/bug/profiles-missing-socgraph
Restore missing socgraph include in profiles
2017-05-28 06:54:09 +02:00
Hypolite Petovan
e762531134 Restore missing include 2017-05-27 21:47:54 -04:00
Hypolite Petovan
6588c7781d Merge pull request #3494 from tobiasd/20170527-ru
PT-BR and RU translations
2017-05-27 15:52:16 -04:00
c74f144f15 RU translations THX Frederico Gonçalves Guimarães 2017-05-27 09:35:23 +02:00
226c7f7910 RU translations THX pztrn 2017-05-27 09:09:41 +02:00
497778ef54 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-25 06:03:08 +00:00
65a0dc4a73 MySQL version and annando 2017-05-25 08:00:22 +02:00
Hypolite Petovan
9418c000a1 Merge pull request #3492 from annando/1705-push-priority
Bugfix: pubsubpublish has always to be called with high priority
2017-05-24 23:09:46 -04:00
646ef9842c Bugfix: pubsubpublish has always to be called with high priority 2017-05-25 03:04:26 +00:00
d649873f80 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-24 20:55:12 +00:00
068e52d4ea typo 2017-05-24 18:42:42 +02:00
096fab0bb5 Merge pull request #3491 from annando/1705-priorities
Improved priorities for handling the item expiration
2017-05-24 18:18:43 +02:00
d48a277624 regen credits 2017-05-24 14:46:27 +02:00
960a1b6e9b core 2017-05-24 14:33:43 +02:00