Commit graph

649 commits

Author SHA1 Message Date
zotlabs
fc6a5486bd Merge branch 'dev' 2018-11-11 19:08:29 -08:00
zotlabs
0e124bb0da change directory default 2018-11-11 18:31:48 -08:00
zotlabs
08f68aae4d Merge branch 'dev' 2018-11-11 17:47:41 -08:00
zotlabs
a4088ec4bf more repair of malformed xchan storage 2018-11-08 17:02:04 -08:00
zotlabs
bc688da078 incorrect ids on some Mastodon xchans 2018-11-08 15:00:33 -08:00
zotlabs
fc63913421 Mastodon notification issues 2018-11-07 18:24:22 -08:00
zotlabs
b590ad1b3f minor warning 2018-11-05 18:47:21 -08:00
zotlabs
ced3fe7aa5 Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev 2018-11-04 17:19:23 -08:00
zotlabs
cb9e81a1d3 route mismatch for comments between osada and zap 2018-11-04 17:18:12 -08:00
Mike Macgirvin
e40d3fcaf7 Merge branch 'patch-20181103b' into 'dev'
Fix array_key_exists with non-array error

See merge request macgirvin/osada!7
2018-11-04 08:50:44 +01:00
DM42.Net (Matt Dent)
4157a0b52f Fix missing paren 2018-11-03 10:26:20 -04:00
DM42.Net (Matt Dent)
916a2e0d0e Fix array_key_exists with non-array error 2018-11-03 10:20:18 -04:00
M.Dent
35aa253ff0 Fix not array, is hash 2018-11-03 10:08:09 -04:00
zotlabs
b20032a61d compatibility fix for prismo 'Page' types and fix from upstream for scaled images 2018-11-01 16:53:45 -07:00
zotlabs
8c860d04ce updates from upstream 2018-10-30 15:42:52 -07:00
zotlabs
7e3c8e46e7 turn photos into proper AS objects (still need to fix the places where they were turned into Note for short-term compatibility) 2018-10-28 20:39:01 -07:00
zotlabs
5c58abd801 superblock leaking through enotify::format 2018-10-25 22:12:47 -07:00
zotlabs
df1000a8a0 add tag_deliver permission to discovered activitypub groups 2018-10-24 22:43:00 -07:00
zotlabs
1898ca3216 strings 2018-10-23 15:36:48 -07:00
zotlabs
b5063ab2a7 Merge branch 'dev' 2018-10-21 18:06:24 -07:00
zotlabs
55a4fa44a2 secondary delivery issue 2018-10-21 18:05:32 -07:00
zotlabs
8993466023 wrong verb on announce notifications 2018-10-20 15:12:23 -07:00
zotlabs
6378cb8f27 miscellaneous fixes, unset project icon, onepoll feed failure 2018-10-20 02:03:31 -07:00
zotlabs
f70f617d64 Merge branch 'dev' 2018-10-18 17:38:01 -07:00
zotlabs
699cd0de85 remove singleton code on activitypub 2018-10-18 17:37:34 -07:00
zotlabs
ea3533119b Merge branch 'dev' 2018-10-18 15:19:28 -07:00
zotlabs
dabd21008f fix branding in email notifications 2018-10-17 21:11:29 -07:00
zotlabs
ff57f8f7bc Merge branch 'dev' 2018-10-17 01:48:07 -07:00
zotlabs
6b1f3eeae6 still some mention url weirdness but this might get past pleroma's parser 2018-10-17 01:26:23 -07:00
zotlabs
5b8f9703e2 Merge branch 'dev' 2018-10-16 20:57:47 -07:00
zotlabs
8c74cfb6a9 better formatting of rsvp reactions 2018-10-16 20:07:45 -07:00
zotlabs
38b54f55d1 event formatting and rsvp parenting 2018-10-16 13:56:46 -07:00
zotlabs
5c456461cf bug - regression 2018-10-15 19:41:17 -07:00
zotlabs
79ab759d58 php warnings 2018-10-15 18:52:55 -07:00
zotlabs
4ee5755bc6 peertube improvements, missing host in dreport 2018-10-15 18:27:03 -07:00
zotlabs
986f385bdd wrong content for announce activities when the object originated on osada 2018-10-15 01:21:47 -07:00
zotlabs
c82d1b03fa missing quote 2018-10-14 19:02:15 -07:00
zotlabs
7fca42bec6 better response handling 2018-10-14 15:47:57 -07:00
zotlabs
23256b5b1a update banner 2018-10-13 17:53:17 -07:00
zotlabs
0b0d5e7eba Merge branch 'dev' 2018-10-11 21:42:16 -07:00
zotlabs
4af3f25c15 remove nav link override, turn announce activities into sourced items 2018-10-11 21:05:30 -07:00
zotlabs
63faaa1b55 improve check for media inclusion 2018-10-11 16:54:31 -07:00
zotlabs
4ad47bae64 typo 2018-10-10 21:46:33 -07:00
zotlabs
9238ec9f68 don't auto-insert mentions in Zap comments 2018-10-10 21:39:33 -07:00
zotlabs
9f5520325f multiple photo issue 2018-10-10 21:36:55 -07:00
zotlabs
31fd804c6b regression found in auto author mention 2018-10-10 21:27:15 -07:00
zotlabs
c998a084da auto mention comment authors; up to 6 total. If more, select the first and last 3 and always exclude yourself. 2018-10-10 20:24:28 -07:00
zotlabs
84552ef9d5 better handling of tombstones, schema changes from upstream 2018-10-10 18:53:26 -07:00
zotlabs
b62879d044 the rest of the bits 2018-10-10 18:00:43 -07:00
zotlabs
c9bcde817a the rest of the bits 2018-10-10 17:58:51 -07:00