Commit graph

8805 commits

Author SHA1 Message Date
nobody
ad52373312 move account and channel to zlib 2022-01-24 17:26:12 -08:00
nobody
aaf374a50f Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2022-01-23 11:44:09 -08:00
nobody
cbd8c77873 revert clearing primary on dead channels. Mark the hubloc deleted instead. Zotfinger will redirect to any living clones we know about. By default, Zotfinger requests will recurse, but this can be disabled if needed. 2022-01-23 11:43:23 -08:00
nobody
08237d4c76 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2022-01-22 12:14:09 -08:00
nobody
445dad7601 roles app 2022-01-22 02:05:42 -08:00
nobody
ef6bcc94a8 more navbar button titles 2022-01-20 23:21:51 -08:00
nobody
b0deb03c4d add titles to top nav buttons 2022-01-20 23:21:51 -08:00
nobody
8ca69c06de Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2022-01-14 18:58:46 -08:00
nobody
131dd72a17 enhance the definition of a DM to exactly one or two channel recips, fix broken strings files in php8 for de, it, and ru 2022-01-14 18:56:33 -08:00
nobody
831265eaa7 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2022-01-14 14:40:12 -08:00
nobody
c6cd681cd5 divide / 0 2022-01-13 14:20:40 -08:00
nobody
b95f96cecd Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2022-01-10 01:00:33 -08:00
Mike Macgirvin
085e386326 replace uuid library 2022-01-10 19:05:05 +11:00
nobody
4961ea0eb3 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2022-01-07 01:57:32 -08:00
nobody
235ccb9437 Merge branch 'dev' of /home/macgirvin/z into dev 2022-01-07 01:55:20 -08:00
nobody
e25aff6e46 warnings 2022-01-07 01:37:56 -08:00
nobody
660232adba Merge branch 'update' of https://codeberg.org/zot/zap into dev 2022-01-04 13:45:05 -08:00
nobody
193a5403a7 Merge branch 'dev' of https://codeberg.org/zot/zap into dev 2022-01-05 08:19:07 +11:00
nobody
9816ee9cea simplify 2022-01-05 08:16:34 +11:00
nobody
ce8182d427 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2022-01-04 02:48:03 -08:00
nobody
54f87302cb Merge branch 'dev' of /home/macgirvin/z into dev 2022-01-04 02:47:38 -08:00
nobody
affcf7bf31 revision 2022-01-04 02:37:31 -08:00
nobody
717934fbf3 dm button in profile: don't show if the observer is the channel page owner. 2022-01-04 02:31:41 -08:00
nobody
ec259c2d67 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-12-27 14:06:19 -08:00
nobody
ef56041bae Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-27 12:38:22 -08:00
nobody
630924642a a couple more tweaks to rpost dm's 2021-12-27 12:37:35 -08:00
nobody
9a6ee51687 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-27 12:10:21 -08:00
nobody
66e05d4a5c rpost dm issue 2021-12-27 12:09:15 -08:00
nobody
52a977cba9 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-12-25 14:46:36 -08:00
nobody
a5f394bfe1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-25 14:46:13 -08:00
nobody
3d121cb54d remote dm 2021-12-25 14:45:01 -08:00
nobody
de25887100 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-12-21 14:20:03 -08:00
nobody
b0970193bd Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-21 14:19:20 -08:00
nobody
d238d73b30 re-factor lockview 2021-12-21 14:03:17 -08:00
nobody
654000ed28 warnings 2021-12-15 00:36:57 -08:00
nobody
7631722d16 bring back dm author link. Move forward on the ability to realistically delete system apps. 2021-12-15 00:32:39 -08:00
nobody
b68e8967ff Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-12-06 13:19:19 -08:00
nobody
2464878064 more fixes from upstream merge 2021-12-05 18:01:10 -08:00
nobody
ed51015ff7 fixes 2 significant merge issues from upstream 2021-12-05 17:45:20 -08:00
nobody
8c66c8e305 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-05 16:49:55 -08:00
nobody
afa8dad055 allow save/star of pubstream items 2021-12-04 12:43:53 -08:00
nobody
d46dd6aeb8 psr12 rewrites, continued 2021-12-03 14:01:39 +11:00
nobody
f602a393a5 psr12 updates 2021-12-03 10:02:31 +11:00
nobody
389b2e5b17 initial psr12 conversion 2021-12-03 09:33:36 +11:00
nobody
bd12691c9f Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-12-01 11:52:30 -08:00
nobody
3afba5f697 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-29 15:59:47 -08:00
nobody
c42c8fb5b7 add messagefilters to view filtering so that these work on public streams and other streams on this site that aren't owned by the observer 2021-11-29 14:20:07 -08:00
nobody
138b672e85 evaluate message filters for both the sender/owner and author prior to storing imported content. 2021-11-28 12:44:35 -08:00
nobody
b2a1861070 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-11-17 11:47:38 -08:00
nobody
98e3880318 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-17 11:43:08 -08:00
nobody
4203e210a3 add perms_specific handling to can_comment_on_post() 2021-11-17 11:38:57 -08:00
nobody
dccc05c8d4 undo changes to map_scope (for now, revisit after pending changes to can_comment_on_post() have been widely circulated for a good deal of time) 2021-11-17 11:26:14 -08:00
nobody
da3c074a91 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-16 18:07:05 -08:00
nobody
9f1951ea7e Merge branch 'dev' of ../p3 into dev 2021-11-16 18:06:54 -08:00
nobody
44d09b9baf typo 2021-11-16 18:06:34 -08:00
nobody
9cdcdae33a Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-16 18:00:34 -08:00
nobody
b84e2c8dd6 Merge branch 'dev' of ../p3 into dev 2021-11-16 17:59:25 -08:00
nobody
b73d84a946 notification and update issues 2021-11-16 17:58:45 -08:00
nobody
3fdee1c00e add missing role to map_perms 2021-11-13 13:11:43 -08:00
nobody
82f715bc83 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-11-11 12:07:37 -08:00
nobody
9b1260dcfc Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-11 12:07:11 -08:00
nobody
875cd9f1b7 Merge branch 'dev' of ../p3 into dev 2021-11-11 12:04:00 -08:00
nobody
6dc0b9c944 syntax error 2021-11-11 12:03:00 -08:00
nobody
19489f588d Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-11-10 20:02:36 -08:00
nobody
b8e403f55c Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-10 20:02:01 -08:00
nobody
502c1dfc6c Merge branch 'dev' of ../p3 into dev 2021-11-10 19:52:40 -08:00
nobody
9263b04d42 remove dead code 2021-11-10 18:38:35 -08:00
nobody
4afd3cec70 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-11-10 17:36:59 -08:00
nobody
fe1df8ff98 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-10 17:34:50 -08:00
nobody
5e3b466b9b simplify logic, generate strings file 2021-11-10 17:33:46 -08:00
nobody
dd23b6708e implement reshare notifications and fix "unable to preserve categories in edited posts" 2021-11-10 12:33:29 -08:00
nobody
2a60e7abde Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-11-07 12:17:31 -08:00
nobody
19470e618e Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-07 12:14:23 -08:00
nobody
952a14bf14 issues with removing items from removed connections 2021-11-07 12:09:54 -08:00
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