Commit graph

22926 commits

Author SHA1 Message Date
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
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
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
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
zotlabs
30f40fd0d2 authenticated fetch fixes 2019-03-09 13:13:04 -08:00
zotlabs
c64a973f6f zot_record_preferred was matching a column that was not supplied 2019-03-08 14:20:24 -08:00
zotlabs
27889aaa06 stupid typo 2019-03-07 20:15:03 -08:00
zotlabs
8a43ee8fa8 changes from upstream 2019-03-07 20:13:33 -08:00
zotlabs
8f9234e77a refetch incomplete activities with receiver credentials 2019-03-07 16:12:22 -08:00
zotlabs
d7e025278a access token issue: xchan not stored on url login 2019-03-06 19:06:49 -08:00
zotlabs
905b7e1fa9 preserve system apps during channel cloning (check those that were installed on the other site and install them locally, preserving categories) 2019-03-06 14:58:19 -08:00
zotlabs
8eb18275c0 auto configure imagick converter during install if /usr/bin/convert is executable 2019-03-05 20:36:15 -08:00
zotlabs
a82b91cd35 import/sync: do not import the system.import_system_apps pconfig, it could prevent creating system apps and leave you with an empty hamburger for 24 hours. 2019-03-05 20:25:00 -08:00
zotlabs
e810c04a06 Merge branch 'dev' of /home/macgirvin/z into dev 2019-03-05 19:52:19 -08:00
zotlabs
d9a94f350c chunk uploads for profile and cover photos 2019-03-05 19:51:41 -08:00
zotlabs
da0fa10b10 syntax error 2019-03-05 18:58:26 -08:00
zotlabs
2540983c87 begin chunked uploads for profile photos 2019-03-05 18:31:38 -08:00
zotlabs
a1af668815 more work to support collections 2019-03-05 17:27:16 -08:00
zotlabs
e686bdaf84 begin change xchan_pubforum to xchan_type 2019-03-05 15:35:17 -08:00
zotlabs
823a5b0c3a reduce assumption of default php upload limit to 2M 2019-03-05 15:22:43 -08:00
zotlabs
1c4475ab0b typo 2019-03-05 14:14:40 -08:00
zotlabs
0e7cc08276 some basic collections/pages support 2019-03-04 23:51:47 -08:00