Commit graph

23778 commits

Author SHA1 Message Date
zotlabs
ec4dde4722 make sure we have a crypto algorithm before attempting encryption 2019-12-23 11:54:55 -08:00
Zot
7ecdb97da4 Merge branch 'dev_homeinstall' into 'dev'
homeinstall - version of recently used script for two real live installations

See merge request zot/zap!18
2019-12-19 23:04:53 +01:00
OJ Random
ea67927b80 homeinstall - version of recently used script for two real live installations 2019-12-19 19:08:59 +01:00
zotlabs
b9204da526 Merge branch 'dev' 2019-12-18 12:19:22 -08:00
zotlabs
5b5f83036a rev update 2019-12-18 12:16:37 -08:00
zotlabs
86c22d1e53 address/mention url conflict 2019-12-17 15:28:24 -08:00
zotlabs
d70b22384f provide an event summary if there is anything at all we can use for that purpose. 2019-12-16 20:26:43 -08:00
zotlabs
2f64bc18a2 Merge branch 'dev' 2019-12-15 16:55:33 -08:00
zotlabs
45a01c25a6 rev update 2019-12-15 15:42:10 -08:00
zotlabs
c0f8f9cf4b process and parse if necessary but don't store implied activities 2019-12-12 16:31:13 -08:00
zotlabs
0388dc7850 Merge branch 'dev' 2019-12-12 14:18:34 -08:00
zotlabs
6e919ca52c clear comment storage when comment is cleared, change tactic to identify implied Create activities 2019-12-12 14:17:16 -08:00
zotlabs
776448a9a7 Merge branch 'dev' 2019-12-11 18:33:25 -08:00
zotlabs
0efbe817db typo 2019-12-11 18:33:09 -08:00
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