friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
15,235 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

15235 Commits

Author SHA1 Message Date
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
Michael Vogel fa3fa42d96 Merge pull request #3423 from Hypolite/improvement/move-app-to-src-2 
Move App to `src` redux
 2017-05-07 19:37:50 +02: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 c52b2f392f Probing has to be done uncached 2017-05-07 16:33:54 +00: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 8c68a84523 Revert DB update 
https://github.com/friendica/friendica/pull/3442#issuecomment-299692884
 2017-05-07 11:27:30 +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
Tobias Diekershoff 76d8a3213f Merge pull request #3441 from annando/1705-bugfix-delete 
Wrong parameter for delete command
 2017-05-07 10:37:14 +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
Hypolite Petovan b3faf3867d Merge pull request #3438 from annando/1705-dba-select 
New function "dba::select" to fetch table rows
 2017-05-06 14:08:42 -04: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
Michael Vogel b832f38632 Merge pull request #3437 from tobiasd/20170506-de 
DE translations
 2017-05-06 10:03:39 +02:00
Tobias Diekershoff 3dc938d2e9 DE translations 2017-05-06 08:56:15 +02: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
Michael da75dbac58 added documention 2017-05-05 20:45:11 +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
Michael 30476623c5 Issue 3318: Make sure that we fetch an author 2017-05-05 19:41:41 +00:00
Tobias Diekershoff 95a358a4a5 Merge pull request #3430 from annando/issue- 
Issue 3428: Autocompletion now always show user@domain.tld
 2017-05-05 14:07:36 +02:00
Michael e11ff8bde5 Issue 3428: Autocompletion now always show user@domain.tld 2017-05-05 11:55:01 +00:00
Tobias Diekershoff 17632118d6 Merge pull request #3429 from annando/1705-mastodon-version 
Mastodon now does return a version number
 2017-05-05 07:56:44 +02:00
Michael 8d97bc61f5 Mastodon now does return a version number 2017-05-05 05:36:43 +00:00
rabuzarus 0135b7e357 Merge pull request #3417 from fabrixxm/feature/frio/admintemplates 
Frio: admin aside template and generic_links_widget
 2017-05-04 15:33:24 +02: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
Hypolite Petovan 87b513dd03 Check src folder in util/typo.php + make it executable 2017-05-03 23:04:14 -04:00
Hypolite Petovan 4d12f1b014 Fix overzealous space addition 2017-05-03 22:41:59 -04:00
Hypolite Petovan 42b4c7601c Merge pull request #3425 from annando/1705-db-port 
It is now possible to connect to a db server with host:port
 2017-05-03 19:17:43 -04: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
Hypolite Petovan 96ae2ff224 Add doc about magic constants __FILE__ and __DIR__ 2017-05-03 10:30:23 -04:00
Hypolite Petovan 8510b4d4dd Merge pull request #3424 from tobiasd/20170503-msg 
missing string for the translations
 2017-05-03 01:31:30 -04:00
Tobias Diekershoff b6277924cf Merge pull request #3422 from annando/1705-diaspora-comments-2 
Follow up for PR 3421 - some improvements
 2017-05-03 07:29:54 +02:00
Michael e1ab0c9475 Now comments are really working 2017-05-03 05:22:39 +00:00
Tobias Diekershoff 6f520a986f regenerated master messages.po file 2017-05-03 07:11:33 +02:00
Tobias Diekershoff 20d69dee27 missing translation call 2017-05-03 07:11:21 +02:00
Hypolite Petovan 569cd459ec Add basepath to App 2017-05-02 23:37:57 -04:00