Commit graph

22648 commits

Author SHA1 Message Date
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
bde2182843 Merge branch 'patch-20181103d' into 'dev'
Fix: Uploaded photo perms set to 'only me' even if force_public_uploads = 1

See merge request macgirvin/osada!9
2018-11-04 08:52:47 +01:00
Mike Macgirvin
709da04938 Merge branch 'patch-20181103c' into 'dev'
Fix spurrious error for sites without images

See merge request macgirvin/osada!8
2018-11-04 08:51:41 +01: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
Mike Macgirvin
265f5adaaf Merge branch 'patch-20181103a' into 'dev'
Fix selfcensored query

See merge request macgirvin/osada!6
2018-11-04 08:49:21 +01:00
DM42.Net (Matt Dent)
bb4cbbba0b Fix: Uploaded photo perms set to 'only me' even if force_public_uploads = 1 2018-11-03 22:28:24 -04:00
DM42.Net (Matt Dent)
8a2e9ec9e6 Fix spurrious error for sites without images 2018-11-03 12:11:17 -04: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
5ef1b23d0f fixes from upstream 2018-10-30 21:28:51 -07:00
zotlabs
8c860d04ce updates from upstream 2018-10-30 15:42:52 -07:00
zotlabs
ff5c0f6292 Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev 2018-10-30 15:29:13 -07:00
Mike Macgirvin
da79f3bfea add league/flysystem 2018-10-31 09:27:49 +11:00
zotlabs
d9170c6617 more photo object work 2018-10-28 21:01:58 -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
516a375fff fix embed photos from albums and phase1 of the forum count bug from hubzilla and the edit post breaking delivery chain bug also from hubzilla 2018-10-27 14:30:07 -07:00
zotlabs
5c58abd801 superblock leaking through enotify::format 2018-10-25 22:12:47 -07:00
zotlabs
7b46fd47fb add my_perms_contains for balance 2018-10-24 23:00:30 -07:00
zotlabs
df1000a8a0 add tag_deliver permission to discovered activitypub groups 2018-10-24 22:43:00 -07:00
zotlabs
60bb243081 handle at least some basic friendica attachment bbcodes 2018-10-24 19:01:43 -07:00
zotlabs
d2cc723e11 separate pubsites page into separate projects 2018-10-23 17:49:08 -07:00
zotlabs
1898ca3216 strings 2018-10-23 15:36:48 -07:00
zotlabs
a6e70394c3 update readme 2018-10-22 20:21:34 -07:00
Mike Macgirvin
26aaaeabf3 disable the demo server again 2018-10-23 11:07:26 +11:00
Mike Macgirvin
441b65c030 mv blueimp library to composer, remove duplicate copy in library 2018-10-23 11:00:33 +11:00
zotlabs
55a4fa44a2 secondary delivery issue 2018-10-21 18:05:32 -07:00
zotlabs
d58054c945 disable blueimp test server 2018-10-20 16:12:35 -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
Andrew Manning
12e6962ff9 Update README.md with some indication of how to get started. 2018-10-18 18:30:12 -07:00
zotlabs
699cd0de85 remove singleton code on activitypub 2018-10-18 17:37:34 -07:00
zotlabs
6d3d106c23 more event work 2018-10-18 15:14:33 -07:00
zotlabs
52c3377c0b event issue 2018-10-18 02:54:40 -07:00
zotlabs
dabd21008f fix branding in email notifications 2018-10-17 21:11:29 -07:00
zotlabs
aeb282d9c1 share improvements 2018-10-17 16:08:43 -07:00
zotlabs
cd2c3f7127 share issue on zot6 side 2018-10-17 15:51:23 -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
89130e78b7 also block upstream swimmers to the source_xchan in a downstream flow 2018-10-16 22:33:45 -07:00
zotlabs
b40115111d rev update 2018-10-16 20:59:54 -07:00
zotlabs
48363c2cab event AP endpoint update 2018-10-16 20:42:44 -07:00
zotlabs
134dd8d653 setup fixes 2018-10-16 20:25:37 -07:00
zotlabs
8c74cfb6a9 better formatting of rsvp reactions 2018-10-16 20:07:45 -07:00
zotlabs
21301adfd3 owa issue 2018-10-16 19:32:17 -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
eda156a5bb regression in socgraph 2018-10-15 19:29:32 -07:00