friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity
16,114 Commits
3 Branches
64 Tags
674 MiB
Commit Graph

16114 Commits (0b66f3ed1eb07091d105b4e71783852204b59960)

Author SHA1 Message Date
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
rabuzarus cf6874cffc Merge pull request #3697 from annando/new-ostatus 
Rewritten OStatus inbound part
 2017-09-12 10:47:29 +02:00
Michael c636b0a6b2 We can now unfollow a contact without deleting it 2017-09-12 06:08:24 +00:00
Michael 519a8807f1 Added documentation 2017-09-11 22:15:16 +00:00
Michael ec929d8207 Fetch the own single post if we are processing a feed of multiple entries 2017-09-11 12:44:37 +00:00
Michael 8e17be7225 Store conversation data 2017-09-10 21:56:05 +00:00
Michael b847f63e2a Added logging 2017-09-10 08:27:24 +00:00
Michael bdf490e2fa Added missing function 2017-09-10 07:58:14 +00:00
Michael 21a630ebae Added documentation 2017-09-10 07:52:07 +00:00
Michael 746169eabf Improve comparabilty 2017-09-10 07:29:24 +00:00
Michael c98c157efe Only some tabs 2017-09-10 07:23:14 +00:00
Michael 4b403e4fe2 OStatus: Reworked import 2017-09-10 07:21:23 +00:00
Tobias Diekershoff a6e1f9c89d Merge pull request #3695 from annando/repeat-picture 
OStatus: Attached pictures now show up in repeated posts as well.
 2017-09-09 10:41:58 +02:00
Michael 52b12fccc9 OStatus: Attached pictures now show up in repeated posts as well. 2017-09-09 07:43:50 +00:00
Tobias Diekershoff 0ae2b1192f Merge pull request #3694 from annando/bugfix-mail 
Bugfix: Mails weren't sent
 2017-09-08 18:24:45 +02:00
Michael 637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
Tobias Diekershoff d79fe20f61 Merge pull request #3693 from annando/remote-self-finally 
"remote self" now finally really works with addons
 2017-09-08 11:00:06 +02:00
Michael c44448dd57 We should reset the session variable 2017-09-08 08:50:08 +00:00
Michael a5a4f53287 This is a better place 2017-09-08 07:08:06 +00:00
Michael 3c6d83acd9 Remote self should now finally trigger all addons 2017-09-08 07:00:38 +00:00
Tobias Diekershoff 785cfbbaef Merge pull request #3690 from annando/diaspora-like 
Diaspora will introduce "like on comment" so we doing it as well
 2017-09-08 08:14:42 +02:00