Commit graph

23017 commits

Author SHA1 Message Date
zotlabs
72d0ca4c56 typo 2019-03-27 21:44:34 -07:00
zotlabs
4a98388904 rev update 2019-03-27 21:18:02 -07:00
zotlabs
26f31b9926 Merge branch 'dev' 2019-03-27 21:17:30 -07:00
zotlabs
94eb4f8060 delivery: work on a copy of the data 2019-03-27 21:16:54 -07:00
zotlabs
0bb49829a6 let people know there's nothing in the moderation queue if the query returns empty 2019-03-27 20:30:12 -07:00
zotlabs
b137417f97 more work on moderation notices 2019-03-27 20:20:36 -07:00
zotlabs
4d48f5e7bf make moderation notifications go to the right place 2019-03-27 19:20:35 -07:00
zotlabs
aaff7c54cf jotgetlink modal 2019-03-26 17:01:55 -07:00
zotlabs
83a79d4b6b fixes from upstream 2019-03-26 16:06:06 -07:00
zotlabs
0030bdac40 xchan_instance_url was still being referenced, add expire app 2019-03-24 22:46:31 -07:00
zotlabs
395d7ba802 make categories app translateable 2019-03-24 20:18:13 -07:00
zotlabs
532019c382 missing use statement 2019-03-24 20:11:24 -07:00
zotlabs
2499086f69 appify categories 2019-03-24 20:08:23 -07:00
zotlabs
1595bdc2aa cleanup/remove unused xchan fields 2019-03-24 18:40:33 -07:00
zotlabs
3a95d71821 more prep work for collections 2019-03-23 15:23:59 -07:00
zotlabs
c3e9840a7d sync apps, fix some warnings and prepare for a jot link modal 2019-03-21 21:57:43 -07:00
zotlabs
bc4d615701 update help text for content filters 2019-03-19 17:23:33 -07:00
zotlabs
dd2c86aaf9 Merge branch 'dev' 2019-03-19 15:25:32 -07:00
zotlabs
503456cc1c incorrect logic function in item_permissions_sql, fix video poster 2019-03-19 15:23:45 -07:00
zotlabs
2f8b1e550b profile gender configurability 2019-03-18 21:33:50 -07:00
zotlabs
7169bd1ebc xss issue from upstream, messagefilter enhancements 2019-03-18 19:19:04 -07:00
zotlabs
2df403c4ec missing function 2019-03-17 21:18:32 -07:00
zotlabs
80463d4754 add video with poster option to bbcode 2019-03-17 20:49:54 -07:00
zotlabs
d07927e1d3 update util/service_class to use serialise (with an s) 2019-03-17 17:41:13 -07:00
zotlabs
b9c0c4e282 rev update 2019-03-17 17:34:57 -07:00
zotlabs
d4e1c9943b Merge branch 'dev' 2019-03-17 17:27:38 -07:00
zotlabs
3c645174b9 Merge branch 'dev' of ../p3 into dev 2019-03-17 16:34:54 -07:00
zotlabs
8e6e157be8 use php_eol in all mail functions 2019-03-17 16:32:21 -07:00
zotlabs
cd4e19f1e7 use zot6 xchan if available for visitors with more than one matching id. 2019-03-17 16:29:38 -07:00
zotlabs
6b09cdfbaf Revert "use CRLF for all email headers"
This reverts commit fe89b8d137.
2019-03-16 15:12:57 -07:00
zotlabs
6eb1aa277a Revert "use CRLF for all email headers"
This reverts commit fe89b8d137.
2019-03-16 15:12:41 -07:00
zotlabs
84a99f9d6f Merge branch 'dev' of ../p3 into dev 2019-03-16 13:46:43 -07:00
zotlabs
06852de396 fix max line length calculation in email_header_encode 2019-03-16 13:46:05 -07:00
zotlabs
fe89b8d137 use CRLF for all email headers 2019-03-16 13:44:43 -07:00
zotlabs
6b233e512a item redirection issue 2019-03-14 17:20:36 -07:00
zotlabs
9983c5c533 missing comma 2019-03-13 18:28:23 -07:00
zotlabs
a192340389 Merge branch 'dev' of ../p3 into dev 2019-03-13 15:24:29 -07:00
zotlabs
21fee2862a use unserialise (with an 's') now 2019-03-13 15:23:22 -07:00
zotlabs
611efdf529 expose the directory publish channel setting 2019-03-12 22:49:18 -07:00
zotlabs
de57d3c909 expose the directory publish channel setting 2019-03-12 22:48:08 -07:00
zotlabs
033b4f7178 allow per-channel notification email (default is account email). There can be more than one (comma separated). 2019-03-12 21:42:32 -07:00
zotlabs
38b1740c0c add indexes 2019-03-12 20:41:58 -07:00
zotlabs
35e42ba156 fetch changes from upstream 2019-03-12 19:13:48 -07:00
zotlabs
527d71b7e8 cert update 2019-03-12 03:45:52 -07:00
zotlabs
bd68d6d691 typos 2019-03-12 03:44:26 -07:00
zotlabs
2a6304ae1e missed a call 2019-03-11 18:12:44 -07:00
zotlabs
774ee98e02 public scopes don't exist in zap 2019-03-11 18:10:38 -07:00
zotlabs
5be2ad8e3a optionally require authenticated fetches 2019-03-11 17:45:44 -07:00
zotlabs
54883729b4 sync security model with upstream changes 2019-03-11 16:05:02 -07:00
zotlabs
c1bf32cdc8 enforce channel and domain blocks on object fetches 2019-03-10 17:11:35 -07:00