dc00d89b9a
Remove test message
2017-06-12 09:45:13 +00:00
8be52424f5
Only check for stale processes every 5 minutes
2017-06-12 09:44:46 +00:00
4fdaca861b
Contact ID is integer
2017-06-11 20:25:51 +00:00
7d0a7f6be9
We got rid of two workerqueue queries, yeah!
2017-06-11 19:51:18 +00:00
06815f1a38
Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster
...
Conflicts:
include/poller.php
2017-06-11 07:49:34 +00:00
4f70682f7a
Inherit the creation date
2017-06-11 07:41:38 +00:00
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
34815de99c
Changed documentation
2017-06-08 21:00:45 +00:00
f1119b4198
Removed commented out line
2017-06-08 20:53:21 +00:00
8f336bffc2
further improvements to the workerqueue
2017-06-08 20:43:30 +00:00
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
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
d5cc757943
Merge branch 'bugfix-index' of github.com:annando/friendica into acl-speedup
2017-06-07 20:26:00 +00:00
1916f7858f
Increase the page load speed with Frio
2017-06-07 19:51:37 +00:00
71a5de40f1
The index mustn't be 192 characters long
2017-06-07 18:34:17 +00:00
5aee2fde1b
Merge remote-tracking branch 'upstream/develop' into issue-2864
2017-06-07 18:17:37 +00:00
1b5f1effa0
Code beautification
2017-06-07 09:51:21 +00:00
2ad784d37a
Speeded up calling "proc_run"
2017-06-07 05:42:30 +00:00
6161ceff64
Merge remote-tracking branch 'upstream/develop' into 1706-lock
2017-06-07 05:28:37 +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
910cca0629
Attached pictures in OStatus posts are now displayed
2017-06-06 17:55:14 +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
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
f3d8da7d33
Merge branch 'master' into develop
2017-06-06 12:20:55 +02: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
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
8db079c65e
Don't always fork the poller.
2017-06-05 06:08:26 +00:00
fb72fc77f5
Some code beautification
2017-06-04 20:03:37 +00:00
2d229ad856
Merge remote-tracking branch 'upstream/3.5.2rc' into 1706-lock
2017-06-04 19:06:40 +00:00
16276b21eb
Typo
2017-06-04 19:05:15 +00:00
bde4943da5
Every hour should mean: every hour :)
2017-06-04 19:01:22 +00:00
30b24a2908
Locking seems to work great now
2017-06-04 18:59:50 +00:00
bca5776e9c
Lock now can use the memcache as well
2017-06-04 15:59:20 +00:00
d2cb87a200
Database locks are now having its very own functions
2017-06-04 12:59:29 +00:00
ad53a03f83
It should be "e" not "p"
2017-06-04 09:00:07 +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
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
81c87885cf
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
2017-05-30 21:07:28 +00: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
a32de855cc
Don't quit if the own host cannot be reached via SSL
2017-05-29 19:14:44 +00:00
104acec09c
The database structure is now checked ad the admin summary page
2017-05-28 08:39:41 +00:00
497778ef54
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
2017-05-25 06:03:08 +00: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
3d14fa3d81
Priority needs to be integer
2017-05-24 10:36:44 +00:00
d2dd0b3248
Minimal poll intervall
2017-05-24 08:21:05 +00:00
d7de7bb70a
Optimized priorities for the automated expiring of items
2017-05-24 06:29:47 +00:00
8abdbb799a
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
2017-05-23 08:13:37 +00:00
1bd6d7dd7a
Bugfix OStatus: Avoid empty author data
2017-05-23 05:28:51 +00:00
e9c9c47a84
Continued a bit:
...
- opps, cherry-pick/rebase/what-ever did not take all over
- used x() for array key check
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-22 13:09:07 +02:00
291af19f25
Some improvements
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-22 13:06:22 +02:00
ac65423de1
Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced
2017-05-20 20:08:24 +00:00
44efdc3e1b
Central item expiration routine for external items
2017-05-20 20:02:06 +00:00
6e8e326705
Bugfix: Timeout problems when saving profile settings
2017-05-19 06:01:13 +00:00
192a5e254a
Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail
2017-05-17 19:56:38 +00:00
696404739b
Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short
2017-05-17 19:25:30 +00:00
b6648215b8
Opps, missed them
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:42:40 +02:00
98b407218d
Fixes:
...
- don't do $string[position] anymore, use substr() instead
- 'extends' was hanging loose there, rewrote it twice to fix parser error
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:39:10 +02:00
0e0fb2b1ee
removed TODOs
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:34:16 +02:00
11c16f1123
Continued:
...
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:32:03 +02:00
0394004fee
reverted comments, but maintained multi-line comment.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:11:22 +02:00
4c2d4934f7
Some CR applied:
...
- removed todo
- added explanation
- merged next if() block with already merged
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:06:13 +02:00
f55ea4bc83
tpzo fixed again ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:02:44 +02:00
afb430b908
tpzo fixed
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:41:01 +02:00
249065b421
opps, went in again? :-/
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:31:46 +02:00
031d96d933
improved some comments
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:28:01 +02:00
635b26353c
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-17 15:08:15 +02:00
347803fd5c
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-17 15:08:15 +02:00
f66c5c6823
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-17 15:07:31 +02:00
cb3077b7a9
It is better this way
2017-05-17 06:07:55 +00:00
7daf5ecde1
Use the contact picture instead of the profile picture
2017-05-17 06:00:20 +00:00
80103f8ad9
Issue 3309: Avatar update should work now
2017-05-16 21:21:54 +00:00
d7b420a44e
opps, re-introduced this out-dated code by mistake
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-16 20:13:08 +02:00
79d524a9ad
opps, added missing curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-16 17:56:36 +02:00
f4a33ed3f0
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-16 14:40:07 +02:00
701e761c68
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-16 14:37:12 +02:00
Hypolite Petovan
48e3f4f47f
Merge pull request #3465 from annando/bugfix-dba-1
...
Bugfix: dba::num_rows hadn't checked the object variable
2017-05-16 02:05:16 -04:00
41f94a62fc
Spelling
2017-05-16 06:00:01 +00:00
124690cc4d
dba: Beautification is now a separate function
2017-05-15 21:06:17 +00:00
875592f285
API: Direct Messages via the API now work again.
2017-05-15 20:11:33 +00:00
83e4141639
Bugfix: dba::num_rows hadn't checked the object variable
2017-05-15 15:17:38 +00:00
05c890f256
Bugfix: The commit in dba::delete was never executed
2017-05-14 07:01:38 +00:00
e884090efa
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
...
Conflicts:
include/uimport.php
2017-05-13 04:13:07 +00:00
74a0a92742
Just some more dba::delete
2017-05-13 04:04:17 +00:00
Hypolite Petovan
2bbcbdc704
Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2
...
Coding convention applied split 2-4-2 (of 2-14-2)
2017-05-12 21:40:30 -04:00
cc4b481bc9
fixed parser error, need parentheses
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-12 21:02:58 +02:00
2b180d7804
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
2017-05-12 16:12:00 +00:00
377fe31907
dba functions in poller / avoiding SQL errors in conversation / dbclean is better
2017-05-12 16:09:25 +00:00
Hypolite Petovan
06ea23665c
Merge pull request #3460 from annando/1705-dbclean
...
dbclean is now using the new database functions
2017-05-12 11:45:27 -04:00
acd9f453d7
And another one
2017-05-12 06:55:04 +00:00
58b2b1dbef
Some more cleaner delete
2017-05-12 06:30:45 +00:00
11e524a555
This item removal is much more cleaner
2017-05-12 06:17:48 +00:00
c00a5223d6
Removed code from the pre worker era.
2017-05-12 04:33:52 +00:00
Hypolite Petovan
4293e27d5c
Improved usage of use in dba_pdo
2017-05-11 23:05:49 -04:00
Hypolite Petovan
c0a6f1122b
Removed useless usage of use
2017-05-11 23:01:49 -04:00
c52f7657ab
Now it should work
2017-05-11 20:19:43 +00:00
6ef24890bb
dbclean is now using the new database functions / new functions for commit, rollback and transaction
2017-05-11 20:13:45 +00:00
Hypolite Petovan
39f894bd4a
Use use instead of \
2017-05-11 11:53:04 -04:00
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
...
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-11 14:54:26 +02:00
Hypolite Petovan
6f6b029c4d
Merge pull request #3456 from annando/1704-mastodon-html
...
HTML for OStatus posts look better (in Mastodon and GNU Social)
2017-05-08 16:54:45 -04:00
3db3d2f1f7
This should make posts fine on GNU Social as well
2017-05-08 19:11:47 +00:00
f602ec30cc
Shared links create now a better HTML
2017-05-08 18:11:37 +00:00
722e03cc58
Added documentation
2017-05-08 17:29:46 +00:00
aa4eafc304
Even better?
2017-05-08 14:31:37 +00:00
rabuzarus
cc8a3a4101
rename methods of the Probe class to camelCase
2017-05-08 16:19:10 +02:00
5abef34284
Should work now ...
2017-05-08 14:02:32 +00:00
3f975f6751
More URL can be styled
2017-05-08 12:35:44 +00:00
2002fc8a2a
Better design for links in Mastodon posts
2017-05-08 12:18:30 +00:00
1f58bcc114
Merge pull request #3418 from gerhard6380/develop
...
New API calls for photo management
2017-05-08 06:56:24 +02:00
Michael Vogel
6680ce1dd7
Merge pull request #3445 from Hypolite/improvement/move-probe-to-src
...
Move Probe to src
2017-05-07 23:14:22 +02:00
Hypolite Petovan
45ec3fb5d8
Add missing include/probe require for probe_url support
2017-05-07 17:08:32 -04:00
2c11e91e65
The first queries are replaced with the new functions. More to come ...
2017-05-07 20:52:00 +00:00
Hypolite Petovan
92550861e9
Updated doc in include/probe.php
...
- Fix standards
2017-05-07 15:00:38 -04:00
Hypolite Petovan
3a2988c3fd
Rename include/Scrape to include/probe
2017-05-07 14:45:19 -04:00
Hypolite Petovan
36e515ee6d
Move Probe to src
2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac
Fix require_once format
2017-05-07 14:40:23 -04:00
Hypolite Petovan
1c38540f20
Merge pull request #3444 from annando/1705-mail-duplicates
...
Mails shouldn't be duplicated anymore when sending
2017-05-07 13:45:34 -04:00
824141d3e5
Mails shouldn't be duplicated anymore when sending
2017-05-07 17:11:09 +00:00
Hypolite Petovan
86cae070f2
Merge branch 'develop' into improvement/move-app-to-src-2
2017-05-07 12:58:11 -04:00
Hypolite Petovan
12cc5f8360
Merge pull request #3443 from annando/1705-diaspora-new-salmon
...
Diaspora: Accept new Salmon format
2017-05-07 12:56:12 -04:00
eb0a701590
Just some more fixes to the protocol and the avatar stuff
2017-05-07 15:58:32 +00:00
ee817e81a2
Bugfix: Status messages had used the wrong field / rearranges parameter order
2017-05-07 14:36:50 +00:00
aa88691bc1
Diaspora: Accept new Salmon format
2017-05-07 13:11:11 +00:00
Michael Vogel
9c3e968581
Merge pull request #3442 from Alkarex/any_value_dbstructure
...
Fix GROUP BY in dbstructure
2017-05-07 12:16:10 +02:00
Alexandre Alapetite
354531bfa6
Generate field_list only when needed
...
https://github.com/friendica/friendica/pull/3442/files#r115137722
2017-05-07 11:07:34 +02:00
Alexandre Alapetite
f838430535
Fix GROUP BY in dbstructure
...
https://github.com/friendica/friendica/issues/3440
2017-05-07 10:53:38 +02:00
054e40de65
And another one
2017-05-07 08:18:50 +00:00
7a3bdbfc15
Wrong parameter for delete command
2017-05-07 08:12:36 +00:00
8dd8936dd0
DESC should be ASC - this is more logically.
2017-05-06 12:46:31 +00:00
3ca70e6362
New function "dba::select" to fetch table rows
2017-05-06 11:32:18 +00:00
