5372 commits

Author	SHA1	Message	Date
Tobias Diekershoff	f3d8da7d33	Merge branch 'master' into develop	2017-06-06 12:20:55 +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
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	f6d10198cc	Bugfix: The poller often couldn't store the pid in the workerqueue	2017-05-30 13:20:29 +00:00
Michael	a32de855cc	Don't quit if the own host cannot be reached via SSL	2017-05-29 19:14:44 +00:00
Michael	104acec09c	The database structure is now checked ad the admin summary page	2017-05-28 08:39:41 +00:00
Michael	646ef9842c	Bugfix: pubsubpublish has always to be called with high priority	2017-05-25 03:04:26 +00:00
Michael	3d14fa3d81	Priority needs to be integer	2017-05-24 10:36:44 +00:00
Michael	d2dd0b3248	Minimal poll intervall	2017-05-24 08:21:05 +00:00
Michael	d7de7bb70a	Optimized priorities for the automated expiring of items	2017-05-24 06:29:47 +00:00
Michael	1bd6d7dd7a	Bugfix OStatus: Avoid empty author data	2017-05-23 05:28:51 +00:00
Michael	6e8e326705	Bugfix: Timeout problems when saving profile settings	2017-05-19 06:01:13 +00:00
Michael	192a5e254a	Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail	2017-05-17 19:56:38 +00:00
Michael	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
Michael	cb3077b7a9	It is better this way	2017-05-17 06:07:55 +00:00
Michael	7daf5ecde1	Use the contact picture instead of the profile picture	2017-05-17 06:00:20 +00:00
Michael	80103f8ad9	Issue 3309: Avatar update should work now	2017-05-16 21:21:54 +00:00
Roland Häder	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
Roland Häder	79d524a9ad	opps, added missing curly braces ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-16 17:56:36 +02:00
Roland Haeder	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
Roland Haeder	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
Michael	41f94a62fc	Spelling	2017-05-16 06:00:01 +00:00
Michael	124690cc4d	dba: Beautification is now a separate function	2017-05-15 21:06:17 +00:00
Michael	875592f285	API: Direct Messages via the API now work again.	2017-05-15 20:11:33 +00:00
Michael	83e4141639	Bugfix: dba::num_rows hadn't checked the object variable	2017-05-15 15:17:38 +00:00
Michael	05c890f256	Bugfix: The commit in dba::delete was never executed	2017-05-14 07:01:38 +00:00
Michael	e884090efa	Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba ... Conflicts: include/uimport.php	2017-05-13 04:13:07 +00:00
Michael	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
Roland Häder	cc4b481bc9	fixed parser error, need parentheses ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-05-12 21:02:58 +02:00
Michael	2b180d7804	Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba	2017-05-12 16:12:00 +00:00
Michael	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
Michael	acd9f453d7	And another one	2017-05-12 06:55:04 +00:00
Michael	58b2b1dbef	Some more cleaner delete	2017-05-12 06:30:45 +00:00
Michael	11e524a555	This item removal is much more cleaner	2017-05-12 06:17:48 +00:00
Michael	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
Michael	c52f7657ab	Now it should work	2017-05-11 20:19:43 +00:00
Michael	6ef24890bb	dbclean is now using the new database functions / new functions for commit, rollback and transaction	2017-05-11 20:13:45 +00:00