Commit graph

5338 commits

Author SHA1 Message Date
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
Hypolite Petovan
45ec3fb5d8 Add missing include/probe require for probe_url support 2017-05-07 17:08:32 -04:00
Michael
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
Michael
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
Michael
eb0a701590 Just some more fixes to the protocol and the avatar stuff 2017-05-07 15:58:32 +00:00
Michael
ee817e81a2 Bugfix: Status messages had used the wrong field / rearranges parameter order 2017-05-07 14:36:50 +00:00
Michael
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
Michael
054e40de65 And another one 2017-05-07 08:18:50 +00:00
Michael
7a3bdbfc15 Wrong parameter for delete command 2017-05-07 08:12:36 +00:00
Michael
8dd8936dd0 DESC should be ASC - this is more logically. 2017-05-06 12:46:31 +00:00
Michael
3ca70e6362 New function "dba::select" to fetch table rows 2017-05-06 11:32:18 +00:00
Hypolite Petovan
a849a25470 Merge pull request #3433 from annando/1705-check_server
Set "last_failure" on connection timeout when checking server
2017-05-05 21:41:52 -04:00