Commit graph

8040 commits

Author SHA1 Message Date
zotlabs
d22285c888 disable directory keywords when forums or collections selected 2019-04-02 19:20:40 -07:00
zotlabs
96d431fcb5 add collections to directory 2019-04-02 18:53:43 -07:00
zotlabs
72e5e64d89 allow escaped quotes in vidoe posters 2019-04-01 12:23:48 -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
zotlabs
d68bdd03ed detect comment moderation with even more precision 2019-03-28 16:41:06 -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
0030bdac40 xchan_instance_url was still being referenced, add expire app 2019-03-24 22:46:31 -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
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
80463d4754 add video with poster option to bbcode 2019-03-17 20:49:54 -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
21fee2862a use unserialise (with an 's') now 2019-03-13 15:23:22 -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
54883729b4 sync security model with upstream changes 2019-03-11 16:05:02 -07:00
zotlabs
30f40fd0d2 authenticated fetch fixes 2019-03-09 13:13:04 -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
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
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
a1af668815 more work to support collections 2019-03-05 17:27:16 -08:00
zotlabs
0e7cc08276 some basic collections/pages support 2019-03-04 23:51:47 -08:00
zotlabs
054e27fc75 remove items for removed connections in the background, also only deliver toplevel sync items to clones and remove these from normal delivery, fix to oep albums which was still using hex2bin/bin2hex (these are now hashes), add content import to translated apps, allow api routes to contain an optional argument. 2019-03-04 15:39:03 -08:00
zotlabs
0d9d899878 turn off singleton delivery in zap 2019-02-28 16:48:34 -08:00
zotlabs
1aa56aa76b add moderated permission 2019-02-28 15:14:22 -08:00
zotlabs
2eabd8cb56 code cleanup 2019-02-25 19:45:50 -08:00
zotlabs
2b7741a8cf make oembed less chatty 2019-02-25 15:00:09 -08:00
zotlabs
e938b7e71e file import issues, change min php version in setup 2019-02-25 14:57:19 -08:00
zotlabs
5baa3fa4ef issues encountered testing content_import plugin 2019-02-24 21:36:06 -08:00
zotlabs
0092c86a6f remove title_tosource option 2019-02-24 15:09:42 -08:00
zotlabs
ff40f44da6 modify item export api call, plus a few changes from upstream 2019-02-23 15:23:33 -08:00
zotlabs
b87f5f16eb support item export by "page" with configurable page size (default 50) and include this call in the Zot API. This should allow (background) import tasks to handle a page at a time per process and import an entire channel content without white-screening, no matter how old or how "chatty" the channel. 2019-02-21 21:33:22 -08:00
zotlabs
428e75dcdb remove duplicated code 2019-02-21 20:02:38 -08:00
zotlabs
117c0aac84 unset uuid for updates 2019-02-19 16:22:58 -08:00
zotlabs
466de65b35 add item uuid 2019-02-19 14:59:22 -08:00
zotlabs
4b96c88e50 more removal of unnecessary legacy stuff, string update 2019-02-17 15:00:08 -08:00
zotlabs
7762053038 no delivery chains for forum tags 2019-02-14 21:06:09 -08:00
zotlabs
e3a5b2fdf8 php warnings 2019-02-14 20:44:34 -08:00
zotlabs
9b36994ef1 Merge ../p3 into dev 2019-02-14 17:08:44 -08:00
zotlabs
a7ba84e6f2 fix forum detection 2019-02-14 16:25:06 -08:00
zotlabs
f25a48c54a accesscontrol rename 2019-02-14 16:01:40 -08:00
zotlabs
63a75cc7d5 rename privacy groups to access lists, forums to groups 2019-02-14 15:26:37 -08:00
zotlabs
c72d19dbf2 profile photo edit date weirdness 2019-02-13 21:07:27 -08:00
zotlabs
154b0e96d5 start zot+/zap+ 2019-02-13 15:33:45 -08:00
zotlabs
880579f249 change repo locations 2019-02-11 15:55:07 -08:00
zotlabs
7dcfd5995b consistent file permissions 2019-02-07 21:34:55 -08:00
zotlabs
9e740c327f small change to notification behaviour 2019-02-05 21:00:00 -08:00
zotlabs
da09048a7d linkify_tags fixes from upstream 2019-02-03 16:57:07 -08:00
zotlabs
0f2e991c56 rename the sharing options and update the license for 2019 2019-01-31 15:54:37 -08:00
zotlabs
9eb9e10712 cache embeds on storage 2019-01-29 15:18:35 -08:00
zotlabs
f5125b51f1 add ical link to activitystreams event objects 2019-01-28 14:58:18 -08:00
zotlabs
c43173109e minor fixes from upstream 2019-01-24 19:03:14 -08:00
zotlabs
045debd26f issues with autoperms, rewrite owa, upstream fixes to main.js 2019-01-23 14:27:51 -08:00
zotlabs
a4f638124b content filter app 2019-01-22 19:11:53 -08:00
zotlabs
56d61ae89b disable online presence indication until there is a viable realtime chat 2019-01-21 21:47:16 -08:00
zotlabs
1d3540ac6c refactor include/follow (Connect::connect()) and update strings 2019-01-21 17:31:24 -08:00
zotlabs
76d66184fc more work on cross-protocol follows with multiple xchans/hublocs 2019-01-20 21:41:19 -08:00
zotlabs
1bdd8b6c52 comment perm issue 2019-01-20 14:39:52 -08:00
zotlabs
289150a21a updates 2019-01-18 13:04:05 -08:00
zotlabs
f81d2f08d1 cleanup 2019-01-17 15:12:58 -08:00
zotlabs
bf39206518 store item_level to avoid a lot of recursion during rendering 2019-01-14 14:47:05 -08:00
zotlabs
a611a1cecc send signed fetches over AP, requeue (queue::update) AP messages on fail, set ajaxasync flag on updates, upstream fixes to mail import 2019-01-13 16:08:26 -08:00
zotlabs
66e0c61ebb separate blacklisting availability for public streams and general communications 2019-01-05 14:47:21 -08:00
zotlabs
7d19624c78 osada: fix parent comment_policy on forum reshares 2019-01-04 22:50:19 -08:00
zotlabs
a0fae60363 slider - convert to flex and style a wee bit 2018-12-28 17:54:11 -08:00
zotlabs
a001507577 assorted issues 2018-12-26 15:33:01 -08:00
zotlabs
ad5381545a affinity slider issues after approving connections 2018-12-17 01:59:17 -08:00
zotlabs
7e4fc5c438 completion of crypto cleanup 2018-12-16 20:37:43 -08:00
zotlabs
e47bc21034 crypto: switch to Keyutils - please review 2018-12-14 12:46:03 -08:00
zotlabs
cd937b058d crypto: migrate new_keypair functions - please review 2018-12-13 17:23:38 -08:00
zotlabs
cb42507e1f crypto: migration please review 2018-12-13 17:16:01 -08:00
zotlabs
c3583e22a4 relocate 2018-12-13 14:28:38 -08:00
zotlabs
b9d1ccbbc3 issues with app ordering 2018-12-12 19:04:59 -08:00
zotlabs
42fa248f81 prefer zot6 hublocs and xchans when there's a choice. 2018-12-11 21:42:15 -08:00
zotlabs
c4b3ad8c76 try to gracefully handle multi-protocol xchans/hublocs with the same url 2018-12-11 20:30:47 -08:00
zotlabs
50ad168ad0 issues with language filtering 2018-12-11 15:57:15 -08:00
zotlabs
74d1b11961 use modulus differentiation between thread levels to aid quick comparisons 2018-12-10 21:01:57 -08:00
zotlabs
643214917d misc fixes, plus add cover photo and profile "about" to AP actor document 2018-12-03 21:45:35 -08:00
zotlabs
8afb181e7a threading tweaks 2018-12-02 20:56:23 -08:00
zotlabs
b3d36b0c7c thread issues 2018-12-02 20:24:12 -08:00
zotlabs
cb59d4a144 thread support 2018-12-02 14:39:58 -08:00
zotlabs
4cd565930c allow notification filtering by name or addr 2018-11-30 19:01:10 -08:00
zotlabs
2ee719abc0 actor type = Organization wasn't being recognised. 2018-11-23 12:18:19 -08:00
zotlabs
b722b87041 new activitypub forum implementation (compatible with mastodon) 2018-11-22 17:04:28 -08:00
zotlabs
00fb137164 more tag stuff 2018-11-21 21:05:08 -08:00
zotlabs
e253a25025 forum work 2018-11-21 17:46:08 -08:00
zotlabs
6dc45a9644 fix wildcard blacklist checking 2018-11-20 21:50:41 -08:00
zotlabs
f10ed01fac hardening 2018-11-20 18:55:33 -08:00
zotlabs
7cc762dcea add more schema validation to clone sync activities 2018-11-19 17:30:22 -08:00
zotlabs
8f6b1c1239 comment delivery issue 2018-11-18 21:53:09 -08:00
zotlabs
c9c26fba1c parsing issue with prismo 2018-11-12 19:38:21 -08:00
zotlabs
5ea011b0ce remove the spoiler blocks 2018-11-11 17:44:01 -08:00
zotlabs
a4088ec4bf more repair of malformed xchan storage 2018-11-08 17:02:04 -08:00
zotlabs
59a47e2835 more on the DM leakage bug 2018-11-07 18:50:41 -08: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
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
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
7b46fd47fb add my_perms_contains for balance 2018-10-24 23:00:30 -07:00
zotlabs
60bb243081 handle at least some basic friendica attachment bbcodes 2018-10-24 19:01:43 -07:00
zotlabs
6378cb8f27 miscellaneous fixes, unset project icon, onepoll feed failure 2018-10-20 02:03:31 -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
cd2c3f7127 share issue on zot6 side 2018-10-17 15:51:23 -07:00
zotlabs
38b54f55d1 event formatting and rsvp parenting 2018-10-16 13:56:46 -07:00
zotlabs
eda156a5bb regression in socgraph 2018-10-15 19:29:32 -07:00
zotlabs
23256b5b1a update banner 2018-10-13 17:53:17 -07:00
zotlabs
e6d8fe98e1 reduce the curl logging info to the important stuff 2018-10-11 21:18:02 -07:00
zotlabs
c9bcde817a the rest of the bits 2018-10-10 17:58:51 -07:00
zotlabs
3a8d916702 better signature handling 2018-10-09 21:08:57 -07:00
zotlabs
b66312e408 status editor hook 2018-10-08 21:27:35 -07:00
zotlabs
1dc002c4fd wrong mime type 2018-10-07 20:37:34 -07:00
zotlabs
87587c40d3 rework the banner code 2018-10-07 19:54:25 -07:00
zotlabs
4d76e4a99f default icon 2018-10-07 19:44:27 -07:00
zotlabs
a5455fa049 add personal filter and fix api zot-auth 2018-10-07 15:51:52 -07:00
zotlabs
2f48679fef fix import/export after project merger 2018-10-04 13:45:20 -07:00
zotlabs
bd5d6158a1 zap/osada repo merger 2018-10-03 19:10:52 -07:00
zotlabs
290b8b58ec rename groups and group_members tables 2018-09-25 17:50:59 -07:00
zotlabs
0bc76e85e4 Merge branch 'zap' into dev 2018-09-19 16:26:36 -07:00
zotlabs
fd0de5fc12 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 16:26:05 -07:00
zotlabs
d3b28b718c Merge branch 'red' into dev 2018-09-18 20:51:38 -07:00
zotlabs
ce70411a6c Merge branch 'zap' into dev 2018-09-18 17:49:14 -07:00
zotlabs
75a39d5e91 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-18 17:48:58 -07:00
zotlabs
f099d0878d double dbesc in item_store_update 2018-09-18 17:46:46 -07:00
zotlabs
0709d0f08e Merge branch 'zap' into dev 2018-09-17 23:41:03 -07:00
zotlabs
ab3d3b029e Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 23:40:45 -07:00
zotlabs
9f14cd4b3c missing connect link if no xchan_addr 2018-09-17 23:40:17 -07:00
zotlabs
f2d3fd0f1a Merge branch 'zap' into dev 2018-09-17 22:53:51 -07:00
zotlabs
f6c5e9e610 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 22:53:38 -07:00
zotlabs
f2c99480f0 generate better photo and event activities 2018-09-17 22:51:27 -07:00
Mario
c4c1b1f5a2 Merge branch 'patch-3' into 'dev'
Save combined view while deleting or recalling first message in thread

See merge request hubzilla/core!1273
2018-09-17 13:29:52 +02:00
Max Kostikov
12b9106fc7 Update zot.php 2018-09-17 13:16:04 +02:00
Max Kostikov
faaffdd618 Update message.php 2018-09-17 13:15:43 +02:00
Max Kostikov
774729b221 Update msglib.php 2018-09-17 13:15:24 +02:00
Mario
eefa47776b Merge branch 'trap-template-errors' into 'dev'
Trap errors in template rendering.  Output a generic error and log problem.

See merge request hubzilla/core!1274
2018-09-17 11:03:37 +02:00
Mario
0b12a7e66f Merge branch 'delete-attach-hook' into 'dev'
delete_attach hook

See merge request hubzilla/core!1275
2018-09-17 11:00:22 +02:00
zotlabs
6d9b38dad8 discover issue 2018-09-16 22:05:04 -07:00
zotlabs
f0266b4837 Merge branch 'zap' into dev 2018-09-16 21:43:20 -07:00
zotlabs
8d565a8305 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 21:43:06 -07:00
zotlabs
943edb4c14 simplify AP discovery 2018-09-16 21:42:41 -07:00
zotlabs
c3a74b3ece setup and channel sync fixes from upstream 2018-09-16 20:01:53 -07:00
zotlabs
27617efbfb Merge branch 'dev' 2018-09-16 19:05:12 -07:00
zotlabs
6ab12597f5 do not sync the channel_moved field 2018-09-16 18:59:12 -07:00
zotlabs
a3e3c93902 consistency 2018-09-16 01:17:25 -07:00
M.Dent (DM42.Net)
abe35817cd Add attach_delete hook 2018-09-15 23:09:16 -04:00
zotlabs
c57e8519dc Merge branch 'zap' into dev 2018-09-15 16:44:27 -07:00
zotlabs
ac0020979c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-15 16:44:06 -07:00
zotlabs
cebfeabc41 logic issue 2018-09-15 16:43:44 -07:00
zotlabs
df7605435f Merge branch 'zap' into dev 2018-09-15 16:21:00 -07:00
zotlabs
34e8a36019 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-15 16:14:52 -07:00
zotlabs
f58c244ba0 refactor include/follow 2018-09-15 16:13:44 -07:00
Max Kostikov
585bdf562a Update msglib.php 2018-09-16 00:43:45 +02:00
Max Kostikov
034441bd13 use common msg_drop function 2018-09-15 22:32:56 +02:00
Max Kostikov
1819704620 Use common msg_drop function 2018-09-15 22:32:07 +02:00
Max Kostikov
18801a6c60 formatting 2018-09-15 22:31:08 +02:00
Max Kostikov
f83c2d5cd1 Create msglib.php 2018-09-15 22:27:39 +02:00
Max Kostikov
724dc48fe8 Add new file 2018-09-15 21:41:13 +02:00
zotlabs
d67d26564d bookmark links are deprecated in zap 2018-09-14 16:49:08 -07:00
Max Kostikov
284e5dd2e8 unification with zot.php code for future reuse 2018-09-15 01:45:54 +02:00
Max Kostikov
3d3f4f50fb formatting 2018-09-15 01:40:17 +02:00
Max Kostikov
8d89c4bbce Save combined view on calling first message in thread 2018-09-15 01:20:49 +02:00
Max Kostikov
85d8225cc0 less data in select 2018-09-15 01:01:48 +02:00
M.Dent
8ad24ca3e8 Catch errors in template rendering. Output a generic error and log problem. 2018-09-14 17:53:28 -04:00
Max Kostikov
6360dee125 formatting 2018-09-14 17:45:42 +02:00
Max Kostikov
e931616011 Save combined view while deleting first message in thread 2018-09-14 17:38:14 +02:00
zotlabs
c16fa755a8 Merge branch 'zap' into dev 2018-09-13 22:40:23 -07:00
zotlabs
4b7770f28c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 22:40:11 -07:00
zotlabs
048c5f65e2 old protocol string still showing 2018-09-13 22:39:05 -07:00
zotlabs
55d4973439 Merge commit 'decf21c' into dev 2018-09-13 20:36:13 -07:00
zotlabs
b253aa9f9c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 20:35:54 -07:00
zotlabs
decf21c78b add privacy groups link 2018-09-13 20:32:44 -07:00
Mario Vavti
869534fafa remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets 2018-09-13 11:53:59 +02:00
Mario Vavti
56f88f2e30 move chat from feature to apps 2018-09-13 11:32:43 +02:00
Mario Vavti
a1d5ce3716 remove profile_tabs() which has been deprecated and replaced by channel_apps() 2018-09-13 10:59:37 +02:00
Mario
78dc679a72 Merge branch 'patch-1' into 'dev'
z_fetch_url with case insensitive headers

See merge request hubzilla/core!1271
2018-09-12 21:11:47 +02:00
Mario Vavti
57e3ee47ee more feature to app transition 2018-09-12 20:52:55 +02:00
Mario Vavti
184928204a Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity 2018-09-12 11:14:49 +02:00
Mario Vavti
2651eae663 mpre feature to app transition 2018-09-12 11:08:53 +02:00
zotlabs
363aba90fb Merge branch 'zap' into dev 2018-09-11 18:03:38 -07:00
zotlabs
8500c2fb21 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-11 18:03:16 -07:00