Commit graph

23714 commits

Author SHA1 Message Date
zotlabs
d6dfe1fab3 Merge branch 'dev' 2019-12-11 18:14:42 -08:00
zotlabs
d83c1323a4 rev update 2019-12-11 18:14:26 -08:00
zotlabs
36c7a7deeb more misskey improvements (barely) 2019-12-11 18:12:50 -08:00
zotlabs
5133ea257c misskey follow issue 2019-12-11 17:47:41 -08:00
zotlabs
5cf47e9648 support incoming misskey/pleroma emoji reactions. A number of issues prevent this from becoming what we send to others. 2019-12-10 15:35:36 -08:00
zotlabs
7caa25da78 warnings 2019-12-09 21:39:48 -08:00
zotlabs
f2e720e6c0 change icon 2019-12-09 15:45:06 -08:00
zotlabs
2c96fd14a1 Merge branch 'dev' of ../p3 into dev 2019-12-09 00:42:18 -08:00
zotlabs
6bc8bfcb7a move jot-reset button out of textarea 2019-12-09 00:41:49 -08:00
zotlabs
394d0e9849 rev update 2019-12-08 18:05:25 -08:00
zotlabs
32949507cf per discussion, default post_activity_item to item_wall = 0 2019-12-08 18:03:43 -08:00
zotlabs
5ce70e2555 comment reset 2019-12-08 16:13:52 -08:00
zotlabs
472cbdce93 Merge branch 'dev' 2019-12-06 12:18:42 -08:00
zotlabs
35cbd7f7c8 regression with code for Friendica bbcode/img tag 2019-12-06 12:17:03 -08:00
zotlabs
55c3f9c154 Merge branch 'dev' 2019-12-05 20:59:16 -08:00
zotlabs
a7c7850003 Merge branch 'dev' of ../p3 into dev 2019-12-05 20:59:05 -08:00
zotlabs
da57f3b185 Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-12-05 20:58:55 -08:00
Zot
c4d5837415 Merge branch 'fix-hide-friends' into 'dev'
Fix: Unsetting "allow others to view friends and connections" doesn't stick

See merge request zot/zap!17
2019-12-06 05:58:20 +01:00
DM42.Net Hubzilla Development
c38aef282d Fix: hide_friends setting won't stick 2019-12-05 23:53:48 -05:00
zotlabs
351ac03c73 Friendica's img bbcode apparently changed to [img=$url][/img] 2019-12-05 20:37:43 -08:00
zotlabs
ff4f01a9a3 Merge branch 'dev' of ../p3 into dev 2019-12-05 19:08:33 -08:00
zotlabs
77f312eca0 add selected text to sub-comments 2019-12-05 19:07:55 -08:00
zotlabs
9a226a8d1c Merge branch 'dev' 2019-12-05 17:38:55 -08:00
zotlabs
1890557dfb use original key 2019-12-05 17:38:26 -08:00
zotlabs
2f974914da Merge branch 'dev' 2019-12-05 16:01:21 -08:00
zotlabs
52ec36667d rev update 2019-12-05 16:00:56 -08:00
zotlabs
2e12dcca31 Merge branch 'dev' of ../p3 into dev 2019-12-05 15:58:42 -08:00
zotlabs
a2f709b6f8 Putting the public inbox in the cc field creates an unlisted post in Mastodon. This software does not support unlisted so just make all public posts and replies public in Mastodon by putting the public inbox into the to field only. 2019-12-05 15:55:45 -08:00
zotlabs
1f49adf594 if http signature fails using cached xchan, try again - ignoring cache, in case public key changed 2019-12-04 20:41:16 -08:00
Mike Macgirvin
4f4d1a22ba Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-12-04 16:47:08 +11:00
Mike Macgirvin
f23d5775fc composer update 2019-12-04 16:46:07 +11:00
zotlabs
7e515085ff Merge branch 'dev' 2019-12-03 17:56:22 -08:00
zotlabs
77cec359f3 rev update 2019-12-03 17:55:54 -08:00
zotlabs
0c041a7c0a Merge branch 'dev' of ../p3 into dev 2019-12-03 17:55:15 -08:00
zotlabs
0157db1ca4 put dividers between pinned posts and regular posts 2019-12-03 17:54:13 -08:00
zotlabs
f611e8bb4f cleanup 2019-12-02 21:23:02 -08:00
zotlabs
aef13ffa29 cleanup template 2019-12-02 21:22:16 -08:00
zotlabs
640629166d cleanup 2019-12-02 21:09:14 -08:00
zotlabs
75ff9318fb pinned posts front end 2019-12-02 21:08:06 -08:00
zotlabs
39040df861 missing pinned post files 2019-12-02 18:44:32 -08:00
zotlabs
f0987c87fe backend for pinned post support - needs more work before it can be enabled 2019-12-02 18:42:59 -08:00
zotlabs
7d799b86a7 Merge branch 'dev' 2019-12-01 20:19:38 -08:00
zotlabs
0773d8e405 rev update 2019-12-01 16:37:25 -08:00
zotlabs
7159cb87ee Merge branch 'dev' of ../apfed into dev 2019-12-01 16:37:07 -08:00
zotlabs
fb17704cb8 mention issues 2019-12-01 16:35:19 -08:00
zotlabs
8d909a8c72 Merge branch 'dev' of ../p3 into dev 2019-11-28 14:07:04 -08:00
zotlabs
8a13280f3e don't permit changing a channel to or from a collection after initial channel creation. Doing so would need to choose or release the channel_parent and this is not implemented currently 2019-11-28 14:04:43 -08:00
zotlabs
d7647eea99 use a 410 instead 2019-11-26 21:33:27 -08:00
zotlabs
ecfcb61b09 empty channel 2019-11-26 21:29:48 -08:00
zotlabs
44bb8410db Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-11-26 21:00:55 -08:00