nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
15506 commits 2 branches 55 tags 148 MiB
Commit graph

5405 commits

Author SHA1 Message Date
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
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 Häder 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 Häder 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
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
Hypolite Petovan 96fb743364 Merge pull request #3434 from annando/1705-unique-index 
Some useful unique indexes
 2017-05-05 21:41:19 -04:00
Hypolite Petovan 3f4502155d Merge pull request #3432 from annando/1705-api 
Twidere reported error 501 when accessing a profile
 2017-05-05 17:57:30 -04:00
Michael 6a594ca8a9 Some useful unique indexes 2017-05-05 21:55:19 +00:00
Michael 9ab0a9299e Set "last_failure" on connection timeout when checking server 2017-05-05 20:51:45 +00:00
Hypolite Petovan b9d64be59f Merge pull request #3431 from annando/issue-3318 
Issue 3318: Make sure that we fetch an author
 2017-05-05 16:38:59 -04:00
Michael f132e27bc9 Twidere reported error 501 when accessing a profile 2017-05-05 20:36:56 +00:00
gerhard6380 877ecf6d04 changed sql for photo table from to avoid memory issues on large photo tables 2017-05-05 22:29:25 +02:00
Michael 30476623c5 Issue 3318: Make sure that we fetch an author 2017-05-05 19:41:41 +00:00
Michael e11ff8bde5 Issue 3428: Autocompletion now always show user@domain.tld 2017-05-05 11:55:01 +00:00
Michael 8d97bc61f5 Mastodon now does return a version number 2017-05-05 05:36:43 +00:00
Hypolite Petovan 0c64178de7 Merge pull request #3426 from annando/1705-diaspora-again 
Diaspora: Better handling for unrelayed comments and likes
 2017-05-04 03:33:13 -04:00
Michael 65823fe28f Standards and documentation 2017-05-04 05:11:19 +00:00
Michael a9c263a375 Retraction does now work as well 2017-05-03 19:55:33 +00:00
Michael d7b56db996 Diaspora: Better handling for unrelayed comments and likes 2017-05-03 19:28:51 +00:00
Michael 353074850e It is now possible to connect to a db server with host:port 2017-05-03 19:22:44 +00:00
Michael e1ab0c9475 Now comments are really working 2017-05-03 05:22:39 +00:00
Hypolite Petovan 569cd459ec Add basepath to App 2017-05-02 23:37:57 -04:00
Hypolite Petovan 3437e73ae4 Yet more standards 2017-05-02 23:37:50 -04:00
Hypolite Petovan 70563e0324 Minor fixes, including overzealous replacement of app -> App 2017-05-02 23:37:30 -04:00
Hypolite Petovan ce866ad39b Remove unrecommended leading backslash for fully qualified namespaces 2017-05-02 23:37:06 -04:00
Hypolite Petovan 1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan 4b16de6d80 Fix wrong class name case 
- Use leading backslash for non-namespace class names in App
 2017-05-02 23:36:46 -04:00
Hypolite Petovan 20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan 56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Michael 83e50385a8 Hopefully this fixes the workflow 2017-05-02 21:06:56 +00:00
Michael 99a54df8d8 Follow up for PR 3421 - some improvements 2017-05-02 19:48:11 +00:00
Michael f639a86d02 Comments from unknown people never reached us 2017-05-02 18:42:01 +00:00
Michael b767a47527 PR 3419: Avoid problems with PHP7 and dba.php 2017-05-02 10:47:53 +00:00
Tobias Diekershoff 5ef44ad71b Merge pull request #3415 from annando/1704-db-relation 
New function to recursively delete data
 2017-05-02 08:37:06 +02:00
gerhard6380 38f476eedb end code with exception where cause is not clear should better be thrown as 500 InternalServerError instead of 400 BadRequest as the request was ok (all checks before passed). 2017-05-02 01:16:54 +02:00
Michael d106ff5086 Error reporting hadn't worked for the new functions 2017-05-01 21:38:37 +00:00
gerhard6380 6a4d1fca88 change line endings to unix 2017-05-01 22:19:48 +02:00
gerhard6380 cd2ed72b37 coding convention applied 2017-05-01 22:16:22 +02:00