Commit graph

5359 commits

Author SHA1 Message Date
Michael 497778ef54 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-25 06:03:08 +00:00
Michael 646ef9842c Bugfix: pubsubpublish has always to be called with high priority 2017-05-25 03:04:26 +00:00
Michael d649873f80 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-24 20:55:12 +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 8abdbb799a Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-23 08:13:37 +00:00
Michael 1bd6d7dd7a Bugfix OStatus: Avoid empty author data 2017-05-23 05:28:51 +00:00
Michael ac65423de1 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-20 20:08:24 +00:00
Michael 44efdc3e1b Central item expiration routine for external items 2017-05-20 20:02:06 +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
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
Hypolite Petovan 39f894bd4a Use use instead of \ 2017-05-11 11:53:04 -04:00
Roland Häder 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
Michael 3db3d2f1f7 This should make posts fine on GNU Social as well 2017-05-08 19:11:47 +00:00
Michael f602ec30cc Shared links create now a better HTML 2017-05-08 18:11:37 +00:00
Michael 722e03cc58 Added documentation 2017-05-08 17:29:46 +00:00
Michael 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
Michael 5abef34284 Should work now ... 2017-05-08 14:02:32 +00:00
Michael 3f975f6751 More URL can be styled 2017-05-08 12:35:44 +00:00
Michael 2002fc8a2a Better design for links in Mastodon posts 2017-05-08 12:18:30 +00:00
Tobias Diekershoff 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