Commit graph

22572 commits

Author SHA1 Message Date
zotlabs
87587c40d3 rework the banner code 2018-10-07 19:54:25 -07:00
zotlabs
4d76e4a99f default icon 2018-10-07 19:44:27 -07:00
zotlabs
a5455fa049 add personal filter and fix api zot-auth 2018-10-07 15:51:52 -07:00
zotlabs
d39fd52f16 one more try altering content so it will get through Mastodon's content mangler 2018-10-04 21:40:16 -07:00
zotlabs
d64e67b18c fix affinity settings, use export var on bbcode destined for ActivityPub recipients to strip out map and embed scripts 2018-10-04 21:16:20 -07:00
zotlabs
9424a7f56b app updates from red/hubzilla 2018-10-04 20:29:41 -07:00
zotlabs
be7cb76651 group support 2018-10-04 18:40:57 -07:00
zotlabs
2f48679fef fix import/export after project merger 2018-10-04 13:45:20 -07:00
zotlabs
02d0256449 fix masto images (again) 2018-10-04 02:19:08 -07:00
zotlabs
6a71ffe2c2 correct the servername 2018-10-03 19:31:47 -07:00
zotlabs
4c758c73aa define platform_name after reading htconfig 2018-10-03 19:23:59 -07:00
zotlabs
bd5d6158a1 zap/osada repo merger 2018-10-03 19:10:52 -07:00
Mike Macgirvin
aa76164fa2 Merge branch 'magicauth' into 'dev'
Fix import_xchan function not found

See merge request macgirvin/osada!3
2018-09-28 07:03:38 +02:00
M.Dent
404b7d48dc Fix import_xchan function not found 2018-09-27 23:13:00 -04:00
zotlabs
f82bb1695d postgres pgrp fix 2018-09-27 17:13:58 -07:00
zotlabs
cdee25ea1b sql error 2018-09-25 23:50:35 -07:00
zotlabs
0460814158 channel signing issue 2018-09-25 20:41:06 -07:00
zotlabs
290b8b58ec rename groups and group_members tables 2018-09-25 17:50:59 -07:00
zotlabs
6f6d54d378 cleanup 2018-09-25 17:50:12 -07:00
zotlabs
cd8150f20d push version 2018-09-23 18:23:28 -07:00
zotlabs
f1ed64efe4 fixes 2018-09-23 17:03:10 -07:00
zotlabs
54bfc4a88d delivery issues 2018-09-21 16:29:13 -07:00
zotlabs
382551e4b4 strip bbcode from event titles 2018-09-20 22:50:12 -07:00
zotlabs
6221d2b1bb php warning 2018-09-20 17:17:41 -07:00
zotlabs
1a3d9ca91b better handling of masto approve 2018-09-19 23:53:26 -07:00
zotlabs
d69b88e793 Merge branch 'zap' into dev 2018-09-19 22:50:47 -07:00
zotlabs
8b123f57ad Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 22:47:25 -07:00
zotlabs
e76d2201bf better handling of media objects 2018-09-19 22:47:03 -07:00
zotlabs
fd71d6c36c Merge branch 'zap' into dev 2018-09-19 22:01:26 -07:00
zotlabs
7d8cbb01bb Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 22:01:11 -07:00
zotlabs
8e4f5007b4 button to add conversation mentions in comments 2018-09-19 22:00:29 -07:00
zotlabs
3b688d678e typo 2018-09-19 21:42:54 -07:00
zotlabs
551314201c Merge branch 'zap' into dev 2018-09-19 20:48:14 -07:00
zotlabs
202c96eb77 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 20:48:00 -07:00
zotlabs
14ad70c587 thread author mentioning (begin) 2018-09-19 20:47:31 -07:00
zotlabs
d6f3867c06 ACTIVITY_CREATE defined twice 2018-09-19 20:45:42 -07:00
Mike Macgirvin
529171de8f Merge branch 'dev' of https://framagit.org/macgirvin/zap into dev 2018-09-20 12:36:29 +10:00
Mike Macgirvin
8b18c99058 reset version 2018-09-20 12:35:16 +10:00
Mike Macgirvin
ca5c5ac0b0 package update 2018-09-20 12:30:39 +10:00
zotlabs
92b2d17297 Merge branch 'zap' into dev 2018-09-19 17:55:15 -07:00
zotlabs
b95f41571c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 17:54:07 -07:00
zotlabs
45ece3c6c5 item fix 2018-09-19 17:53:49 -07:00
zotlabs
e98ca4af20 fix item, setup 2018-09-19 17:52:21 -07:00
zotlabs
9725e55eb9 Merge branch 'dev' 2018-09-19 16:29:29 -07:00
zotlabs
0bc76e85e4 Merge branch 'zap' into dev 2018-09-19 16:26:36 -07:00
zotlabs
fd0de5fc12 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 16:26:05 -07:00
zotlabs
c0f8940b60 indicate cached records 2018-09-19 16:25:05 -07:00
zotlabs
a8b582dd58 this was needed 2018-09-18 23:19:50 -07:00
zotlabs
d3b28b718c Merge branch 'red' into dev 2018-09-18 20:51:38 -07:00
zotlabs
7756773683 missing autocomplete (e.g. mentions) in mod_photos comments 2018-09-18 19:52:10 -07:00