Commit graph

9886 commits

Author SHA1 Message Date
Michael Vogel 7581bd0f36 Send a salmon notice whenever an OStatus user is mentioned. 2015-06-25 00:47:59 +02:00
Michael Vogel db256217e6 Removed test 2015-06-24 22:51:46 +02:00
Michael Vogel 5bf7a3b7a5 Fixed inReplyTo in conversations 2015-06-24 22:31:38 +02:00
Michael Vogel c66d095389 Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter 2015-06-24 21:05:38 +02:00
Tobias Diekershoff 40bff1a4cf Merge pull request #1686 from annando/1506-vier-threading-2
Improved width for nested comments
2015-06-24 16:27:53 +02:00
Michael Vogel 87ade53162 Some test code added 2015-06-24 14:21:42 +02:00
Michael Vogel 3841c41186 Improved width for nested comments. 2015-06-24 14:20:08 +02:00
Michael Vogel 2112b9cacc Merge pull request #1684 from fabrixxm/install
Install: load htconfig template from view/templates/
2015-06-23 14:19:30 +02:00
Fabrixxm a3cd16bd9f remove localized htconfig templates 2015-06-23 12:35:51 +02:00
Fabrixxm d06beb1431 install: load htconfig template from templates/ 2015-06-23 12:35:51 +02:00
Tobias Diekershoff 5549dd1dbe Merge pull request #1682 from fabrixxm/issue-1625
admin: allow deletion of any users but yourself
2015-06-23 11:05:16 +02:00
Tobias Diekershoff 1e030df286 Merge pull request #1681 from fabrixxm/issue-1629
Add contact detail to contact drop confirm
2015-06-23 11:04:26 +02:00
Fabrixxm 3168b44317 admin: allow deletion of any users but yourself
fix #1625
2015-06-23 10:39:28 +02:00
Fabrixxm 53e6dd6637 Add contact detail to contact drop confirm
fix #1629
2015-06-23 10:09:27 +02:00
Tobias Diekershoff 24c91a4fed Merge pull request #1679 from fabrixxm/smallfixestothemes
use fields template in photo edit form
2015-06-23 09:12:25 +02:00
fabrixxm 2076b95179 Merge pull request #1680 from annando/issue-1642-again
Just some more fixing for issue 1642
2015-06-23 09:09:29 +02:00
Michael Vogel a7cf3639f0 Just some more fixing for issue 1642 2015-06-22 23:47:08 +02:00
fabrixxm 35e9fc3b02 use fields template in photo edit form 2015-06-22 20:07:19 +02:00
Tobias Diekershoff a58596e00a Merge pull request #1678 from annando/1506-ostatus-completion
OStatus: Still some room for improvements
2015-06-22 07:59:40 +02:00
Tobias Diekershoff bc82b94564 Merge pull request #1677 from annando/1506-vier-threads
Vier: Improved threading
2015-06-22 07:55:39 +02:00
Michael Vogel e9542a8d17 OStatus: Support for events and questions 2015-06-21 22:36:24 +02:00
Michael Vogel da9bbc92d3 OStatus: Support for bookmarks 2015-06-21 22:02:44 +02:00
Michael Vogel bc42b6440a Vier: Improved threading 2015-06-21 20:40:39 +02:00
fabrixxm 50af1fc2c3 Merge pull request #1676 from tobiasd/20150620-markdown
markdownification problems
2015-06-21 11:46:13 +02:00
Michael Vogel 2afc9c31f9 Changed logging behaviour 2015-06-21 08:32:03 +02:00
Michael Vogel 5221f38db7 ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them. 2015-06-21 01:37:09 +02:00
Michael Vogel 8229737d2d Small restructuring 2015-06-21 01:36:23 +02:00
Michael Vogel df7b907bc4 Display: Look for the network name when fetching the contact (important because of the statusnet connector) 2015-06-21 01:34:57 +02:00
Michael Vogel 846edd5bbb Bugfix for repeated items in conversations 2015-06-20 17:26:47 +02:00
Michael Vogel 1bbbf2a5f2 Stuff ... 2015-06-20 14:41:53 +02:00
Michael Vogel c8430f4c44 Moved all OStatus code in a single file. 2015-06-20 14:40:30 +02:00
Tobias Diekershoff 7c48ed60eb hide some HTML coded chars from markdownification 2015-06-20 14:27:42 +02:00
Tobias Diekershoff 8fa2030023 <3 causes troubles in D* 2015-06-20 12:31:34 +02:00
Michael Vogel 168906f9c9 Code cleanup 2015-06-20 09:15:19 +02:00
Michael Vogel 6fbb03801c The OStatus completion is now called before the original item is stored. 2015-06-20 08:44:29 +02:00
Tobias Diekershoff 650e6bc575 Merge pull request #1674 from fraengii/patch-2
Update Quick-Start-groupsandpages.md
2015-06-17 10:52:11 +02:00
Frank Dieckmann 3c135c4d78 Update Quick-Start-groupsandpages.md
Changed the style in line 12. I think it is better now.
2015-06-17 10:48:23 +02:00
Tobias Diekershoff f1dbbfd291 Merge pull request #1673 from fraengii/patch-1
Update Connectors.md
2015-06-17 10:39:41 +02:00
Frank Dieckmann 85bf6e8fb4 Update Connectors.md
Changed '<domain_des_friendica-servers>/friendica' to '&lt;domain_des_friendica-servers&gt;/friendica'
2015-06-17 10:32:50 +02:00
fabrixxm 1cd5a3184d Merge pull request #1672 from tobiasd/20150614-frank
resolving merge issues with DE doc merging
2015-06-15 14:00:18 +02:00
Tobias Diekershoff 78321c2a43 Merge pull request #1670 from annando/setup-rewrite-check
The installation prozess has a problem with self signed certificates
2015-06-15 13:25:54 +02:00
Tobias Diekershoff 7ef99269e7 Merge pull request #1671 from annando/issue-1642-b
This is working fix for issue 1642
2015-06-15 13:25:26 +02:00
Tobias Diekershoff 4312da6326 BOSH server for Jappixmini addon 2015-06-15 13:19:02 +02:00
Tobias Diekershoff c2ca9a3e17 hint in the docs to start from develop 2015-06-15 13:18:32 +02:00
Tobias Diekershoff e839e3e1ec Merge remote-tracking branch 'frank/2015-06-12-fraengii-doc.de-linguistic_style' into 20150614-frank 2015-06-15 13:07:36 +02:00
Michael Vogel 7feda0120f This is working fix for issue 1642 2015-06-15 01:20:04 +02:00
Michael Vogel 0e157b1288 Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check 2015-06-15 00:55:05 +02:00
fabrixxm 42f4f3fce9 Merge pull request #1668 from annando/issue-1642
Better detection for the mobile client to avoid "{0}" in notifications
2015-06-14 15:58:52 +02:00
fabrixxm c7566d4917 Merge pull request #1669 from annando/1506-ostatus-v3
Yet another OStatus improvement
2015-06-14 15:52:10 +02:00
fabrixxm 4ec7102c9c Merge pull request #1667 from annando/1506-remote-subscribe
Remote subscribe from a GNU Social site is now possible
2015-06-14 15:49:03 +02:00