Commit graph

1398 commits

Author SHA1 Message Date
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
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
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
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
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
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
8dd7159cd5 zot_revision > 10 is considered nomad compliant. 2021-10-28 01:55:09 -07:00
nobody
2c1449ca51 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-03 19:32:34 -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
b473b96527 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-23 16:39:33 -07:00
nobody
17105fcd15 more sitechan backend stuff 2021-09-23 15:26:31 -07:00
nobody
a7db0aeaf4 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-28 23:48:40 -07:00