clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,984 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

15984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silke Meyer ab87f1215a Merge remote-tracking branch 'upstream/develop' into develop 2017-10-04 21:28:35 +02:00
Silke Meyer eadeb3ed21 Fixed settings for test mysql database and updated documentation 2017-10-04 20:25:15 +02:00
Michael Vogel 21fecb956c Merge pull request #3723 from shaftoe/develop 
Fix Nginx example config
 2017-09-24 16:35:12 +02:00
Alexander Fortin 1939de2b33 Fix Nginx example config 
Check https://stackoverflow.com/questions/15423500/nginx-showing-blank-php-pages#16887296
for the rest of the change (without, I get white page on a testing
vagrant box)
 2017-09-23 20:55:49 +02:00
Tobias Diekershoff 3e8dc38180 Merge pull request #3716 from annando/bugfix-mail 
Bugfix: Mails weren't created
 2017-09-19 15:10:22 +02:00
Michael fdc010bb1b Bugfix: Mails weren't created 2017-09-19 12:59:24 +00:00
Tobias Diekershoff ca5b12063d Merge pull request #3715 from annando/ostatus-atom 
OStatus: Directly serve atom+xml if requested
 2017-09-19 14:44:38 +02:00
Michael b79c3241c6 Directly serve atom+xml if requested 2017-09-19 11:53:19 +00:00
Tobias Diekershoff c993865169 Merge pull request #3713 from annando/pleroma-detection 
Bugfix: Pleroma was detected as Mastodon
 2017-09-18 08:34:45 +02:00
Michael 5ed24954f0 Bugfix: Pleroma was detected as Mastodon 2017-09-18 06:09:18 +00:00
Tobias Diekershoff 9a0bcc402a Merge pull request #3712 from annando/ostatus-again 
Some more OStatus stuff
 2017-09-18 07:44:18 +02:00
Michael 926314a24c gcontact is now updated with the new database functions as well 2017-09-17 08:13:10 +00:00
Michael 8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
Tobias Diekershoff af44e96fc9 Merge pull request #3710 from annando/diaspora-retraction 
Diaspora: Sending retractions only worked for posts
 2017-09-16 21:24:50 +02:00
Tobias Diekershoff 58adb42009 Merge pull request #3709 from annando/diaspora-link2 
Improvement for PR 3705: The detection has to be changed here as well
 2017-09-16 21:23:55 +02:00
Michael ef8ad9f1ed Diaspora: Sending retractions only worked for posts - nor for comments or likes 2017-09-16 18:23:24 +00:00
Michael 0982a30c89 Improvement for PR 3705: The detection has to be changed here as well 2017-09-16 17:22:22 +00:00
Tobias Diekershoff 7e193cfb7a Merge pull request #3708 from annando/dba-bugfix 
Bugfix for pictures that weren't stored / reworked database calls
 2017-09-16 07:24:56 +02:00
Michael 0eb92bf12a Unused functions removed 2017-09-16 05:09:14 +00:00
Michael 72b42ad688 Last blob is now filled with the new functions 2017-09-15 21:17:58 +00:00
Michael dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
Michael 6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
Michael Vogel 40fa941518 Merge pull request #3707 from tobiasd/20170915-message 
regenerated master messages.po file
 2017-09-15 14:14:52 +02:00
Tobias Diekershoff 30bc6ab088 regenerated master messages.po file 2017-09-15 10:08:26 +02:00
Tobias Diekershoff fb0451473f Merge pull request #3706 from annando/network-page 
Reworked network page
 2017-09-15 09:31:43 +02:00
Michael c12075a005 Merge remote-tracking branch 'upstream/develop' into network-page 2017-09-15 06:42:33 +00:00
Tobias Diekershoff 0384e875a2 Merge pull request #3702 from annando/new-dba 
The old database function is now replaced with a wrapper
 2017-09-15 08:31:25 +02:00
Michael f8d34e35e7 "exists", "select" whre is the difference? 2017-09-15 06:15:25 +00:00
Michael 88ada98245 Added documentation 2017-09-15 06:07:34 +00:00
Tobias Diekershoff 3d4ae91569 Merge pull request #3698 from annando/unfollow 
We can now unfollow a contact without deleting it
 2017-09-15 07:36:15 +02:00
Tobias Diekershoff ad3566aeaa Merge pull request #3704 from annando/ostatus-improved 
OStatus: Only fetch items that don't exist in the system
 2017-09-15 07:18:14 +02:00
Tobias Diekershoff ba5cbbe880 Merge pull request #3705 from annando/diaspora-link-2 
Improved regular expression for the Diaspora link detection
 2017-09-15 07:15:54 +02:00
Michael cf90e3571f Merge remote-tracking branch 'upstream/develop' into new-dba 2017-09-15 03:17:40 +00:00
Michael cd16155c96 Only warn when there are arguments at all 2017-09-15 03:10:04 +00:00
Michael f29e21eb5c We now avoid prepared statements without an argument 2017-09-15 03:00:38 +00:00
Michael d10eaefaa9 Improved regular expression for the Diaspora link detection 2017-09-14 22:04:37 +00:00
Michael 87fffde80e Documented some unknown verbs 2017-09-14 20:40:05 +00:00
Michael 9dfb9c1c45 Only fetch items that don't exist in the system 2017-09-14 19:23:14 +00:00
Michael 9468b7427d Allow replies as well 2017-09-14 10:00:45 +00:00
Tobias Diekershoff 641e41067e Merge pull request #3701 from annando/issue-3700 
Issue 3700: Security and Privacy related Headers
 2017-09-14 10:28:03 +02:00
Tobias Diekershoff 6057dc51f5 Merge pull request #3703 from annando/api-twidere 
API: Improvements for clients with bad HTML support
 2017-09-14 10:25:17 +02:00
Michael c3589dc043 Added documentation 2017-09-14 06:10:33 +00:00
Michael 4b99d122dd Added explanation 2017-09-14 05:48:43 +00:00
Michael 7a3bb02f11 Issue 3700: Security and Privacy related Headers 2017-09-14 05:40:23 +00:00
Michael c6ceae5225 The old database function is now replaced with a wrapper 2017-09-14 05:19:05 +00:00
Michael e18a037fb2 API: Improvements for clients with bad HTML support 2017-09-14 05:16:23 +00:00
Michael 92537d6926 Rearranged code 2017-09-13 09:20:08 +00:00
Michael a5cf2c69c8 Reworked network page 2017-09-13 06:43:43 +00:00
Michael 3dcd281de4 Rearranged code 2017-09-12 11:04:59 +00:00
Michael 15b65a86e5 Merge remote-tracking branch 'upstream/develop' into unfollow 2017-09-12 09:09:40 +00:00