Commit graph

8727 commits

Author SHA1 Message Date
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