Commit graph

8781 commits

Author SHA1 Message Date
nobody
5e7aa7889d Merge branch 'dev' of ../roadhouse into dev 2021-11-03 15:14:10 -07:00
nobody
420de7eb75 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-03 15:12:32 -07:00
nobody
dfd21f843d array was shifted so $i[0] no longer exists, results in tag and mail notifications that don't redirect properly 2021-11-03 15:10:55 -07:00
nobody
9de4784437 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-11-01 14:54:56 -07:00
nobody
f910f7ae93 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-01 14:54:27 -07:00
nobody
e1b0bb8911 Merge branch 'dev' of ../p3 into dev 2021-11-01 14:53:38 -07:00
nobody
06d622df88 backward compatibility for import files from later protocol variants 2021-11-01 14:50:39 -07:00
nobody
301884f2b9 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-31 13:11:30 -07:00
nobody
41ede5749a Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-31 13:08:00 -07:00
nobody
52c7ed6352 Merge branch 'dev' of ../p3 into dev 2021-10-31 13:03:16 -07:00
nobody
1ae6a35391 wordsmithing 2021-10-31 13:02:44 -07:00
nobody
9af1a1fca3 comment permissions redo 2021-10-31 13:00:28 -07:00
nobody
b29c8cd5e6 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-30 23:44:46 -07:00
nobody
2b9a51d65d Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-30 23:44:35 -07:00
nobody
12bf9e9680 Merge branch 'dev' of ../p3 into dev 2021-10-30 23:43:10 -07:00
nobody
69db553f03 zap issue #55 2021-10-30 23:42:49 -07:00
nobody
84f77b8d19 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-28 15:15:35 -07:00
nobody
979699ebfa re-order webfinger results so that protocols are naturally discovered in order of our preferences: 1. nomad, 2. zot6, 3. activitypub 2021-10-28 13:44:32 -07:00
nobody
c01775799f update more x-zot stuff to x-nomad 2021-10-28 13:02:31 -07:00
nobody
8dd7159cd5 zot_revision > 10 is considered nomad compliant. 2021-10-28 01:55:09 -07:00
nobody
b07a9b28f1 missing paren 2021-10-27 19:26:21 -07:00
nobody
59ebf15782 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-27 18:43:19 -07:00
nobody
6867115d9b Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-27 18:43:07 -07:00
nobody
8aaea14612 make channel exports forward and backward compatible 2021-10-27 18:42:16 -07:00
nobody
d48683bc33 branding 2021-10-27 17:47:17 -07:00
nobody
8832f4e16a cleanup earlier changes - we'll now reference purl.org/nomad instead of purl.org/macgirvin/nomad 2021-10-26 14:37:39 -07:00
nobody
158f5f2b58 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-26 13:18:31 -07:00
nobody
895ae64e10 zap issue 52 2021-10-24 13:23:50 -07:00
nobody
c764ff8306 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-17 15:23:50 -07:00
nobody
a06dd1fc37 allow remote connections without owa 2021-10-16 14:56:36 -07:00
nobody
01d066105f Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-15 13:50:17 -07:00
nobody
5f158a5cdc consolidate public stream source configuration 2021-10-14 04:50:40 -07:00
nobody
29ec3a5bab Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-12 14:25:34 -07:00
nobody
67d3402a6b add link relations to image objects 2021-10-12 14:20:36 -07:00
nobody
6365a80087 add attributedTo to Create/Image objects 2021-10-09 19:59:13 -07:00
nobody
2c1449ca51 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-03 19:32:34 -07:00
nobody
ff628bdfed upstream fixes to channel delete syncing, more command completion work for nomad-shell 2021-10-03 19:30:35 -07:00
nobody
fea3f89190 php8 warnings 2021-10-01 16:00:12 -07:00
nobody
8643faf521 update media type for roadhouse 2021-09-29 02:33:48 -07:00
nobody
579da20950 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-29 02:31:28 -07:00
nobody
7ad8627544 Don't send group Announce activities which boost poll responses. These don't require notifications on microblog platforms. 2021-09-28 19:20:11 -07:00
nobody
3a9d47673d fix some of the group poll issues. Remaining: don't Announce answers, group owner unable to vote currently 2021-09-28 18:28:12 -07:00
nobody
0ed7cd4afc groupoll: set source mediaType so that we don't purify the various sharing classes out of the html 2021-09-28 17:25:34 -07:00
nobody
7c3f40b706 undo poll prohibition on groups on the testing branch for this feature 2021-09-28 16:27:14 -07:00
nobody
8b93199608 disable sharing polls until the issues are resolved 2021-09-27 14:52:50 -07:00
nobody
5d1beb100d make polls work in groups 2021-09-27 02:10:31 -07:00
nobody
045443bbd3 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-24 15:18:36 -07:00
nobody
7ebffd636c allow site channels in the directory again 2021-09-24 15:17:54 -07:00
nobody
1517cf1a84 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-23 18:36:18 -07:00
nobody
0280683443 mop up and go home 2021-09-23 18:35:54 -07:00
nobody
6df87c0579 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-23 17:21:28 -07:00
nobody
b43ae97a46 fix signatures 2021-09-23 17:20:56 -07:00
nobody
b473b96527 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-23 16:39:33 -07:00
nobody
3a862cb6c8 Merge branch 'dev' of ../z into sitechan 2021-09-23 16:33:09 -07:00
nobody
82533f602b update 2021-09-23 16:32:44 -07:00
nobody
17105fcd15 more sitechan backend stuff 2021-09-23 15:26:31 -07:00
nobody
319f3ce5e3 more work on site chan 2021-09-23 13:35:35 -07:00
nobody
f99db54419 sitechan updates 2021-09-20 22:51:28 -07:00
nobody
41de2d93d0 only include the ability to switch to the sys channel if the logged in user is admin 2021-09-17 14:19:59 -07:00
nobody
3f4d8d4ac8 Merge branch 'dev' into sitechan 2021-09-17 14:13:17 -07:00
nobody
04a4818640 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-16 16:24:41 -07:00
nobody
009e457f36 guest pass issue 2021-09-16 16:12:44 -07:00
nobody
fe78110c4b sitechan work to new branch 2021-09-14 00:58:36 -07:00
nobody
bb7fb78b5e Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-13 04:29:29 -07:00
nobody
be41b4d120 suggestions: combine scores for social distance and keyword matches 2021-09-12 22:59:35 -07:00
nobody
0b8675a5b0 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-12 22:19:33 -07:00
nobody
3a6bb2ab2a corrections to tag matching part of suggestion query 2021-09-12 21:20:42 -07:00
nobody
2d12e04b8a social tag match (still testing) 2021-09-12 20:49:53 -07:00
nobody
0a69c8c535 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-08 01:39:37 -07:00
nobody
3d7c376422 hl => mark 2021-09-08 01:37:46 -07:00
nobody
11b4721681 Notifications API backend. Still needs cache/filter before enabling. 2021-09-06 23:32:54 -07:00
nobody
3a9324d327 zotsh -> nsh 2021-09-04 01:27:16 -07:00
nobody
95b99e5462 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-03 17:17:01 -07:00
nobody
a81a70c107 new function unpack_link_id to complement gen_link_id 2021-09-03 15:14:39 -07:00
nobody
2d2b9d97bc bring back registration form validation 2021-08-31 06:15:14 -07:00
nobody
8686db666e group tests 2021-08-30 15:46:34 -07:00
nobody
8b91fa4437 disallow direct view of data: attachments 2021-08-30 05:10:32 -07:00
nobody
a7db0aeaf4 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-28 23:48:40 -07:00
nobody
080bf86415 notification fixes cont. 2021-08-28 23:46:33 -07:00
nobody
b08966f75c Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-28 22:01:50 -07:00
nobody
ac02c174d3 different approach to solving the problem where a notification will appear for the parent for conversations you comment on. 2021-08-28 21:59:30 -07:00
nobody
e78cf015ba update siteinfo.json 2021-08-28 18:56:37 -07:00
nobody
0220ac5c2b Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-28 02:18:30 -07:00
nobody
2ea178e0c3 version 2021-08-28 02:15:53 -07:00
nobody
80d1b176de link files and photos views 2021-08-27 17:37:32 -07:00
nobody
8f7a5d2947 defer updates if comments in progress 2021-08-26 22:15:24 -07:00
nobody
851a6ace41 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-24 23:06:40 -07:00
nobody
f6d9500195 AP service actor record at site root 2021-08-24 22:59:48 -07:00
nobody
386892171c Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-18 14:49:59 -07:00
nobody
5eca3e4e8c treat svg's as dangerous in filebrowser, cleanup atom validation, provide extra logging around the precise reason for allowed posts 2021-08-18 14:18:52 -07:00
nobody
50ac040704 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-12 13:19:02 -07:00
nobody
edbe7c013e add animated gif check function, fix misty issue 3 (mysql is picky about when to use "default") 2021-08-12 13:04:44 -07:00
nobody
a3f68af9a9 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-03 17:31:22 -07:00
nobody
eda4a2c116 include/network:get_request_string() ignore fragments 2021-08-03 17:12:28 -07:00
nobody
c1a3e42479 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-31 04:17:47 -07:00
nobody
686cbed2e5 more consistent text 2021-07-31 04:13:51 -07:00
nobody
7c449a0b6a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-27 23:59:30 -07:00
nobody
003650f8cc Merge branch 'dev' of ../p3 into dev 2021-07-27 05:27:21 -07:00
nobody
0fd7ad5be0 dreport log 2021-07-27 05:26:47 -07:00
nobody
6e4d7c3f7d Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-26 15:27:43 -07:00
nobody
90d16e7884 Merge branch 'dev' of ../p3 into dev 2021-07-25 17:21:25 -07:00
nobody
3a03e6285c some preliminary work on threaded comments refactor, bring back poke app. 2021-07-25 17:20:10 -07:00
nobody
4b8de363f2 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-24 14:58:32 -07:00
nobody
8c422bf2c9 provide separate network timeout settings for get and post. We can allow a bit more time for posting as this is nearly always done in the background, and a lot of sites seem to be running on under-powered hardware these days and are failing to respond within 60 seconds and are therefore effectively dead when it comes to pushing stuff. 2021-07-24 14:48:51 -07:00
nobody
e6d668356c php8 warning 2021-07-22 03:57:52 -07:00
nobody
1dcea2925a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-21 18:11:25 -07:00
nobody
853ff59f0f php8 warnings, string and version update 2021-07-19 14:24:22 -07:00
nobody
3baade2087 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-18 16:20:42 -07:00
nobody
4666a150ae fixes 2021-07-18 14:17:42 -07:00
nobody
83ddfb0dd3 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-13 22:36:01 -07:00
nobody
fe5c4528fc php8 warnings 2021-07-13 22:31:46 -07:00
nobody
4c6c2c920d Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-12 23:52:52 -07:00
nobody
c333a4c5f2 bring back 'post_mail' permission, but remove PERMS_NETWORK as an option as it is ambiguous in Zap and derivatives 2021-07-12 17:24:49 -07:00
nobody
879af8a750 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 22:37:54 -07:00
nobody
ec74318ff0 php8 undefined warnings, cont. 2021-07-11 16:46:03 -07:00
nobody
28ad858121 chanview ui improvements 2021-07-11 14:41:51 -07:00
nobody
d1c158eed2 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-10 20:03:42 -07:00
nobody
69649197d1 php error in log statement due to preformatting the date when errors occur 2021-07-08 16:18:53 -07:00
nobody
39342526d4 more tweaks to remote profile photo cache storage function 2021-07-03 19:33:21 -07:00
nobody
95dbb252b9 ...or I suppose we could just make it work correctly 2021-07-02 15:47:50 -07:00
nobody
9c601e8160 import_remote_xchan_photo(): modified check was incorrect ($outfile undefined), but it just adds complexity - so just fetch the photo. 2021-07-02 15:13:38 -07:00
nobody
45b22d9018 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-26 18:45:41 -07:00
nobody
7624107adf re-enable 'supress_duplicates' 2021-06-26 18:44:46 -07:00
nobody
38e012179a rework setup and include wording fix from zap pull #30 which could not be merged due to conflicts. 2021-06-25 15:40:15 -07:00
nobody
7f1e3d4923 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-25 02:50:03 -07:00
nobody
d2df20e41e Hide original group DM from the group owner. We only keep it as a reference and its presence in the group owner's stream is confusing. 2021-06-25 01:32:57 -07:00
nobody
23f254091e fine tuning group comments 2021-06-24 13:54:33 -07:00
nobody
d0925fec2d mastogroups: provide a normal 'Announce' body if we have enough information to do so. 2021-06-24 00:44:41 -07:00
nobody
38e5b8d107 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-23 21:30:30 -07:00
nobody
633cadbf4e provide full object if available 2021-06-23 17:13:10 -07:00
nobody
01c3c68b2c more syntax issues from having a string item['obj'] 2021-06-23 16:54:26 -07:00
nobody
73a6e614a8 syntax 2021-06-23 16:48:19 -07:00
nobody
f80f246d23 don't boost reactions 2021-06-23 01:52:52 -07:00
nobody
91f32b11ca mastogroups - support moderation 2021-06-23 00:19:51 -07:00
nobody
efe8657cf2 mastogroups 2021-06-22 23:25:13 -07:00
nobody
a3c866768b Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-22 14:26:06 -07:00
nobody
9ad5568afd commit some experimental work so that it doesn't create conflict later. 2021-06-22 02:16:28 -07:00
nobody
0a34b71a46 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-21 22:08:01 -07:00
nobody
cabed0682c improved photo editing and alt text support 2021-06-21 22:03:11 -07:00
nobody
41f1159adc Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-21 00:38:33 -07:00
nobody
03e635677c store photo tags with linked item 2021-06-19 20:16:08 -07:00
nobody
b127575110 permit item['obj'] and item['target'], etc. to contain a single URL in storage rather than an object array; it is still json_encoded.
disable/filter unicode right-to-left over-ride in content as it is often abused and can totally destroy presentation. Use HTML text-direction tags or CSS instead since the HTML purifier will force closure.
2021-06-19 16:04:32 -07:00
nobody
29fd3dad2c tempfix 2021-06-18 22:47:42 -07:00
nobody
e0b5393817 Merge branch 'dev' of ../p3 into dev 2021-06-18 22:13:56 -07:00
nobody
5dde6a54c1 groups work from roadhouse 2021-06-18 22:12:23 -07:00
nobody
5ea7105272 ongoing: fix a few more php 8.x warnings 2021-06-18 16:54:08 -07:00
nobody
35ea8d7d7e finish removal of deprecated server_role and sitelist 2021-06-17 14:54:15 -07:00
nobody
bff85bf5e4 names 2021-06-17 14:18:54 -07:00
nobody
7689676e7d Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-12 14:59:51 -07:00
nobody
441261e2d8 updates 2021-06-12 14:57:46 -07:00