Commit graph

592 commits

Author SHA1 Message Date
zotlabs
c4ea93e6a6 better signature handling 2018-10-09 21:11:29 -07:00
zotlabs
2e9e82662a Merge branch 'master' of https://framagit.org/macgirvin/osada 2018-10-04 22:10:34 -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
02d0256449 fix masto images (again) 2018-10-04 02:19:08 -07:00
zotlabs
bd5d6158a1 zap/osada repo merger 2018-10-03 19:10:52 -07:00
zotlabs
6277969cd6 Merge branch '1.2' 2018-09-26 16:37:23 -07:00
zotlabs
951e56194a sql error 2018-09-25 23:51:51 -07:00
zotlabs
cdee25ea1b sql error 2018-09-25 23:50:35 -07:00
zotlabs
b990758e5c channel signing issue 2018-09-25 20:41:45 -07:00
zotlabs
0460814158 channel signing issue 2018-09-25 20:41:06 -07:00
zotlabs
ac9f5b4e77 rename groups and group_members tables 2018-09-25 17:51:27 -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
05a6ce58a5 Merge branch '1.2' 2018-09-23 18:24:02 -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
380f5f0d88 php warning 2018-09-20 17:18:30 -07:00
zotlabs
6221d2b1bb php warning 2018-09-20 17:17:41 -07:00
zotlabs
a18add6ea2 better handling of masto approve 2018-09-19 23:54:11 -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
e76d2201bf better handling of media objects 2018-09-19 22:47:03 -07:00
zotlabs
1c368e8d7a Merge branch 'dev' 2018-09-19 22:02:33 -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
ee23165208 Merge branch 'dev' 2018-09-19 20:48:38 -07:00
zotlabs
551314201c Merge branch 'zap' into dev 2018-09-19 20:48:14 -07:00
zotlabs
14ad70c587 thread author mentioning (begin) 2018-09-19 20:47:31 -07:00
zotlabs
9725e55eb9 Merge branch 'dev' 2018-09-19 16:29:29 -07:00
zotlabs
4f4e892995 Merge branch 'dev' 2018-09-19 16:28:15 -07:00
zotlabs
0bc76e85e4 Merge branch 'zap' into dev 2018-09-19 16:26:36 -07:00
zotlabs
c0f8940b60 indicate cached records 2018-09-19 16:25:05 -07:00
zotlabs
d3b28b718c Merge branch 'red' into dev 2018-09-18 20:51:38 -07:00
zotlabs
9bbaa17b80 Merge branch 'dev' 2018-09-17 23:41:27 -07:00
zotlabs
0709d0f08e Merge branch 'zap' into dev 2018-09-17 23:41:03 -07:00
zotlabs
9f14cd4b3c missing connect link if no xchan_addr 2018-09-17 23:40:17 -07:00
zotlabs
0b71807ffe don't deliver to non-deliverable hosts 2018-09-17 23:38:50 -07:00
zotlabs
6667554916 missing connect link if no xchan_addr 2018-09-17 23:34:33 -07:00
zotlabs
f2d3fd0f1a Merge branch 'zap' into dev 2018-09-17 22:53:51 -07:00
zotlabs
b16e5716b7 Merge branch '1.0' 2018-09-17 22:53:19 -07:00
zotlabs
5c21236dc1 Merge branch 'dev' into 1.0 2018-09-17 22:53:04 -07:00
zotlabs
f2c99480f0 generate better photo and event activities 2018-09-17 22:51:27 -07:00
zotlabs
30154b0f0b Merge branch 'zap' into dev 2018-09-16 22:07:35 -07:00
zotlabs
dad5039b09 Merge branch 'dev' 2018-09-16 22:04:54 -07:00
zotlabs
6ccbb9a14d Merge branch 'dev' into 1.0 2018-09-16 22:04:44 -07:00
zotlabs
cf64349379 usort : use class function 2018-09-16 22:04:11 -07:00