Roland Häder
|
4e49939421
|
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2
Signed-off-by: Roland Häder <roland@mxchange.org>
|
2017-06-13 23:26:06 +02:00 |
|
Tobias Diekershoff
|
1838024f6d
|
Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators
Replace explicit php logical operators
|
2017-06-09 07:44:19 +02:00 |
|
Hypolite Petovan
|
ad4cdf2a9d
|
Replace lowercase operators
|
2017-06-08 21:03:44 -04:00 |
|
rabuzarus
|
fa27256932
|
Merge pull request #3527 from annando/acl-speedup
Increase the page load speed with Frio
|
2017-06-08 23:09:49 +02:00 |
|
Michael
|
34815de99c
|
Changed documentation
|
2017-06-08 21:00:45 +00:00 |
|
|
Tobias Diekershoff
|
b9b047f2af
|
Merge pull request #3523 from annando/issue-2864
Issue 2864: Create a alternate link for every status
|
2017-06-08 10:45:36 +02:00 |
|
|
Michael
|
0541a62134
|
The function "construct_acl_data" isn't used at all, it seems. it is deactivated now
|
2017-06-08 03:56:42 +00:00 |
|
|
Hypolite Petovan
|
2281989866
|
Replace && by AND in SQL queries
|
2017-06-07 22:01:14 -04:00 |
|
|
Hypolite Petovan
|
9c0d2c31e8
|
Replace AND and OR in PHP conditions by && and ||
|
2017-06-07 22:00:59 -04:00 |
|
|
Michael
|
d5cc757943
|
Merge branch 'bugfix-index' of github.com:annando/friendica into acl-speedup
|
2017-06-07 20:26:00 +00:00 |
|
|
Michael
|
1916f7858f
|
Increase the page load speed with Frio
|
2017-06-07 19:51:37 +00:00 |
|
|
Michael
|
71a5de40f1
|
The index mustn't be 192 characters long
|
2017-06-07 18:34:17 +00:00 |
|
|
Michael
|
5aee2fde1b
|
Merge remote-tracking branch 'upstream/develop' into issue-2864
|
2017-06-07 18:17:37 +00:00 |
|
|
Michael
|
1b5f1effa0
|
Code beautification
|
2017-06-07 09:51:21 +00:00 |
|
|
Michael
|
2ad784d37a
|
Speeded up calling "proc_run"
|
2017-06-07 05:42:30 +00:00 |
|
|
Michael
|
6161ceff64
|
Merge remote-tracking branch 'upstream/develop' into 1706-lock
|
2017-06-07 05:28:37 +00:00 |
|
|
Michael
|
6e6941a546
|
We have an alternate link
|
2017-06-06 21:56:25 +00:00 |
|
|
Michael
|
4e748668c6
|
Spaces
|
2017-06-06 20:10:47 +00:00 |
|
|
Michael
|
929f518e5c
|
Added documentation
|
2017-06-06 17:38:58 +00:00 |
|
|
Michael
|
de9cddc82f
|
Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced
|
2017-06-06 17:30:40 +00:00 |
|
Michael Vogel
|
f4652d6e50
|
Merge branch 'develop' into 1706-lock
|
2017-06-06 14:16:00 +02:00 |
|
|
Michael
|
f96423feae
|
Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock
|
2017-06-06 12:12:07 +00:00 |
|
|
Michael
|
8d13751d40
|
Increased database version
|
2017-06-06 12:07:27 +00:00 |
|
|
Michael
|
e00105d649
|
Don't fork a new worker
|
2017-06-06 11:59:38 +00:00 |
|
|
Tobias Diekershoff
|
f3d8da7d33
|
Merge branch 'master' into develop
|
2017-06-06 12:20:55 +02:00 |
|
|
Michael
|
ba7b4fddea
|
memory check is now also only done once in a while
|
2017-06-06 04:00:24 +00:00 |
|
|
Michael
|
2b04865cdb
|
We found the handbrake ...
|
2017-06-05 22:41:33 +00:00 |
|
|
Michael
|
2bff8e302a
|
Removing the lock after the process was removed is better
|
2017-06-05 16:56:21 +00:00 |
|
|
Michael
|
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 |
|
|
Michael
|
8db079c65e
|
Don't always fork the poller.
|
2017-06-05 06:08:26 +00:00 |
|
|
Michael
|
fb72fc77f5
|
Some code beautification
|
2017-06-04 20:03:37 +00:00 |
|
|
Michael
|
2d229ad856
|
Merge remote-tracking branch 'upstream/3.5.2rc' into 1706-lock
|
2017-06-04 19:06:40 +00:00 |
|
|
Michael
|
16276b21eb
|
Typo
|
2017-06-04 19:05:15 +00:00 |
|
|
Michael
|
bde4943da5
|
Every hour should mean: every hour :)
|
2017-06-04 19:01:22 +00:00 |
|
|
Michael
|
30b24a2908
|
Locking seems to work great now
|
2017-06-04 18:59:50 +00:00 |
|
|
Michael
|
bca5776e9c
|
Lock now can use the memcache as well
|
2017-06-04 15:59:20 +00:00 |
|
|
Michael
|
d2cb87a200
|
Database locks are now having its very own functions
|
2017-06-04 12:59:29 +00:00 |
|
|
Michael
|
ad53a03f83
|
It should be "e" not "p"
|
2017-06-04 09:00:07 +00:00 |
|
|
Michael
|
32f61016d3
|
Overhauled "lock" functionality
|
2017-06-04 07:26:21 +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 |
|
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 |
|
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 |
|
|
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 |
|
|
Michael
|
81c87885cf
|
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
|
2017-05-30 21:07:28 +00:00 |
|
|
Michael
|
f6d10198cc
|
Bugfix: The poller often couldn't store the pid in the workerqueue
|
2017-05-30 13:20:29 +00:00 |
|