Commit graph

23075 commits

Author SHA1 Message Date
zotlabs
339b724c35 use urlify from composer 2019-04-11 23:59:44 -07:00
Mike Macgirvin
d3cc537211 move urlify to composer 2019-04-12 16:54:18 +10:00
zotlabs
6bdf35ec67 move everything from include/environment to setup where it is used 2019-04-11 21:52:20 -07:00
zotlabs
cb2a64b036 move markdown to zlib 2019-04-11 21:10:31 -07:00
zotlabs
5cb0e7600b some cleanup 2019-04-11 20:26:38 -07:00
zotlabs
7efc231b11 make categories app actually do something useful 2019-04-11 17:06:56 -07:00
zotlabs
1cfa2d435e activity_filter - wrong icon 2019-04-11 13:41:41 -07:00
zotlabs
eafe31d4de typo 2019-04-11 04:10:59 -07:00
zotlabs
736714decf repeating event work and some fixes from upstream 2019-04-10 23:45:24 -07:00
zotlabs
0e8f34021e schema mods for recurring events 2019-04-10 00:20:41 -07:00
zotlabs
a85dd22604 add event taxonomy and attachments to item obj 2019-04-09 17:12:31 -07:00
zotlabs
1c7aff1084 Merge branch 'dev' of https://gitlab.com/macgirvin/zap into dev 2019-04-08 18:36:46 -07:00
Mike Macgirvin
bf9df5b09b composer update 2019-04-09 11:35:23 +10:00
zotlabs
db15d2a98e event cleanup 2019-04-07 21:20:06 -07:00
zotlabs
74b59450f8 rev update 2019-04-07 18:09:07 -07:00
zotlabs
7472c3af2a really remove delegate perms 2019-04-06 16:36:23 -07:00
zotlabs
0fcea5d448 remove automatic delegat permission from collections, add max-width to oembed iframes 2019-04-06 16:33:49 -07:00
zotlabs
d6602c088e security: perms_pending not evaluated correctly 2019-04-05 16:58:51 -07:00
zotlabs
f32dfdfcf7 auto friend collections 2019-04-05 00:54:35 -07:00
zotlabs
fd02fb95d9 update obscurify 2019-04-04 19:55:17 -07:00
zotlabs
2e7e461027 piled up deliveries were not getting scheduled for localhost, probably these were piled up as the result of a queue threshhold breach 2019-04-04 19:14:32 -07:00
zotlabs
9a37e9a33a move collections to a different button that doesn't get disabled when privacy is turned on. 2019-04-03 22:18:13 -07:00
zotlabs
98461ccf61 fix activity_filter widget collection display when groups present 2019-04-03 18:37:03 -07:00
zotlabs
3f1fff5c08 remove default mention on groups/collections when accessing via network page 2019-04-03 18:26:48 -07:00
zotlabs
0db3fd4ff4 enable the collection roles 2019-04-03 16:23:06 -07:00
zotlabs
8f4a3723da the rest of the stuff to support collections 2019-04-03 16:22:03 -07:00
zotlabs
d22285c888 disable directory keywords when forums or collections selected 2019-04-02 19:20:40 -07:00
Mike Macgirvin
2baf27c761 Merge branch 'dev' of https://gitlab.com/macgirvin/zap into dev 2019-04-03 12:56:43 +11:00
zotlabs
96d431fcb5 add collections to directory 2019-04-02 18:53:43 -07:00
Mike Macgirvin
6c0fa45124 Merge branch 'dev' of https://gitlab.com/macgirvin/zap into dev 2019-04-02 13:51:35 +11:00
zotlabs
b2e8b0c1da better check for comments_closed 2019-04-01 19:50:59 -07:00
Mike Macgirvin
78a5868933 Merge branch 'dev' of https://gitlab.com/macgirvin/zap into dev 2019-04-02 13:17:59 +11:00
zotlabs
4bd184c47a missing permissionlimits 2019-04-01 19:17:28 -07:00
zotlabs
7093c2d514 use affinity slider to set default affinity slider values 2019-04-01 19:04:08 -07:00
zotlabs
a441a5b901 convert new-friend activity to note since ASV2 vocabulary is incompatible with ASV1. 2019-04-01 17:00:00 -07:00
Mike Macgirvin
20c8e9de15 Merge branch 'dev' of https://gitlab.com/macgirvin/zap into dev 2019-04-02 09:21:53 +11:00
zotlabs
4dd8393976 do a better job of mapping comment policy to zot6, use photo table (not item object) to get photolink in embedphotos 2019-04-01 15:19:41 -07:00
Mike Macgirvin
04f58be4b5 Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-04-02 06:29:33 +11:00
Mike Macgirvin
e875a2b6a7 fix version 2019-04-02 06:28:11 +11:00
Mike Macgirvin
ada1522f3e Merge branch 'dev' of https://gitlab.com/macgirvin/zap into dev 2019-04-02 06:24:52 +11:00
zotlabs
72e5e64d89 allow escaped quotes in vidoe posters 2019-04-01 12:23:48 -07:00
Zot
ec249ba721 Merge branch 'patch-20190211a' into 'dev'
Return all listeners

See merge request zot/zap!1
2019-04-01 05:49:33 +02:00
zotlabs
47283ba2ef filter out a specific unusual activity 2019-03-31 18:01:20 -07:00
Mike Macgirvin
691ecb4c0b Merge branch 'master' of https://gitlab.com/macgirvin/zap 2019-03-31 10:01:29 +11:00
Mike Macgirvin
c00f5118a0 Merge branch 'dev' of https://gitlab.com/macgirvin/zap 2019-03-31 10:00:19 +11:00
zotlabs
ad021811d8 make sure enough info in edited photos is changed to actually update on the other end 2019-03-30 15:56:37 -07:00
zotlabs
42dcc86e3e linkinfo honour link-only setting for images, local videos. Photo editing anomalies. 2019-03-30 15:01:25 -07:00
zotlabs
bf2a92b83b check service class limits on file sync 2019-03-29 22:09:55 -07:00
zotlabs
5bcf392816 add hierarchy to channels for collection support and other purposes 2019-03-29 13:27:23 -07:00
Mike Macgirvin
529bbf7cd0 composer update 2019-03-29 16:09:57 +11:00