carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
19,712 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

19712 Commits (1f996662d4f34842b93f44c278d57b46e0b26ae1)

Author SHA1 Message Date
justcool393 1f996662d4 end if 2022-10-07 23:02:21 -07:00
justcool393 a910cede78 userBanBlock block was incorrect on mobile 2022-10-07 22:43:36 -07:00
justcool393 437f7e63d7 upper admin tools macro 
also we change the remove admin and revert admin actions button to be red
 2022-10-07 22:43:36 -07:00
justcool393 45a52e96f4 some small whitespace changes 2022-10-07 22:43:36 -07:00
justcool393 8f2d656bb3 rename page and also add macro for ban area 2022-10-07 22:43:36 -07:00
Snakes 3949670088
WPD: sidebar update for flair & rule changes. 2022-10-08 01:10:39 -04:00
Snakes d1e065460e
Fix hole modlog pagination. 2022-10-08 00:32:03 -04:00
justcool393 558ee805ec re-add revert admin actions function and also fix a bug with it 2022-10-07 21:07:44 -07:00
Aevann1 345608bcf3 sneed 2022-10-08 04:00:08 +00:00
justcool393 6df6054938 remove revert admin actions function 2022-10-07 20:48:37 -07:00
Snakes f7a52ddb8c
PCM live: stop infinite recursion on invalid input. 2022-10-07 22:32:33 -04:00
Aevann1 b515b8bd15 change DOMAIN env var to SITE (for consistency) 2022-10-08 04:06:55 +02:00
Aevann1 137fa7c6d6 remove unused blocks + allow banners to be expandable everywhere 2022-10-08 04:04:46 +02:00
Snakes 1966ccec6c
Fix incorrect identifier in create_hole. 
Looks to have been accidentally introduced in 9575e11b8b, because
for some reason this is the only route that uses `name` instead of
`sub`. Weird. Perhaps worth changing to sub for consistency, but
surely there's some reason it's like this.
 2022-10-07 21:28:13 -04:00
Aevann1 398c841632 fix the ruckus image on dark theme 2022-10-08 03:26:50 +02:00
Aevann1 df977228ae Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-08 03:19:19 +02:00
Aevann1 cbbcbd570a Revert "fix WPD" 
This reverts commit 6750a156fd.
 2022-10-08 03:19:16 +02:00
Snakes 556b3e3c4e
PCM: don't rescale uploaded banners. 2022-10-07 21:16:56 -04:00
Aevann1 6750a156fd fix WPD 2022-10-08 03:14:54 +02:00
Aevann1 897885316f disable asset submissions in WPD and PCM 2022-10-08 03:00:27 +02:00
Aevann1 81f9e1b386 rename env var for consistency 2022-10-08 02:45:26 +02:00
Aevann1 2a638f71c3 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-08 02:44:06 +02:00
Aevann1 cfd4b6399f use mailgun again 2022-10-08 02:44:02 +02:00
Aevann1 aa8e7055fb rework env vars a bit 2022-10-08 02:43:04 +02:00
Snakes 7ea61f423d
PCM: disable gambling; extend FEATURES['GAMBLING']. 2022-10-07 20:31:46 -04:00
Aevann1 c6fb0da30b sneed 2022-10-08 00:15:54 +00:00
Aevann1 e89eae1ec4 same as last commit 2022-10-08 01:01:26 +02:00
Aevann1 d85c3d8797 make WPD banners clickable 2022-10-08 01:01:04 +02:00
Aevann1 074f46d900 sneed 2022-10-07 21:02:06 +00:00
Snakes f4a722d151
Fix lootbox purchasing identifier conflict. 2022-10-07 17:01:29 -04:00
justcool393 0627a12bc5 don't let users comment on things they can't see 2022-10-07 03:22:07 -07:00
justcool393 48384ba8e5 convert a couple of the old constantified permissions to the new system 
i don't want to break something so i'm keeping one of them for now but it just links
 2022-10-07 01:50:20 -07:00
justcool393 91cb50db38 import with context 2022-10-07 01:18:20 -07:00
justcool393 7a0692b16a minor whitespace change 2022-10-07 01:11:59 -07:00
justcool393 96bd7d65b4 correct form name 2022-10-07 01:11:59 -07:00
justcool393 6b037f26e0 spaces -> tabs here 
idk if that's the "accepted" code style but i'm using it here for consistency
 2022-10-07 01:11:59 -07:00
justcool393 d3712f0378 correct class names in javascript 2022-10-07 01:11:59 -07:00
justcool393 9874470065 lower userpage admin tools as a macro 2022-10-07 01:11:59 -07:00
justcool393 26fbf726a4 remove unused permission 2022-10-06 23:24:00 -07:00
Snakes e3bed60169
WPD: temporarily rewrite /videos/ post URLs. 2022-10-07 01:43:04 -04:00
justcool393 1e585c07fa
p author id 2022-10-06 21:36:31 -07:00
Aevann1 b608a514e4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-07 05:25:37 +02:00
Aevann1 2d2a35d7ca make giving awards not refresh the page 2022-10-07 05:25:34 +02:00
justcool393 c5fa8a9e0c sb fix 2022-10-06 20:20:51 -07:00
justcool393 2d66363fed fix mobile template 2022-10-06 20:19:39 -07:00
justcool393 d9cc95dd71 fix global hole mod and template error 2022-10-06 20:06:22 -07:00
Aevann1 182784f097 sneed 2022-10-07 02:57:38 +00:00
justcool393 460894346d
Merge pull request #390 from justcool393/permissions-refactor 
[DO NOT MERGE] complete permissions refactor
 2022-10-06 19:56:05 -07:00
justcool393 c4c3d6cf49
Merge branch 'frost' into permissions-refactor 2022-10-06 19:55:36 -07:00
Aevann1 a2600767d1 notify ppl when admins add them into CC or disallow them from it 2022-10-07 04:51:56 +02:00