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

9352 Commits (e74108ae6527fb73755cf0f07cfbba06f4b65428)

Author SHA1 Message Date
Aevann1 db929c7615 simplify 3 js functions 2022-10-10 06:56:39 +02:00
Snakes cf1844d6a4
Fix hat counter logic breaking Simps listing. 2022-10-08 23:55:40 -04:00
Snakes 10921331fa
Move user hat properties for userpage to model. 2022-10-08 16:30:27 -04:00
Snakes 8bb145d23c
Fix userpage hats owned display. 2022-10-08 16:12:03 -04:00
justcool393 4baf7cfa42 make text gold when owned all hats 2022-10-08 10:44:39 -07:00
justcool393 d05cb09040 fix some minor formatting 2022-10-08 10:39:36 -07:00
justcool393 491d71a9b5 add owned hats to user page per fish request 2022-10-08 10:37:44 -07:00
justcool393 8292ef8e7e fix clubbing posts 2022-10-08 08:59:31 -07:00
justcool393 fb3dc1706e one missing </div> seriously 
okay and some formatting
 2022-10-08 08:53:34 -07:00
justcool393 57a917339d gonna try and make it not broken 
i think whitespace is the issue here
also fix grant- and bar- classes
 2022-10-08 02:31:18 -07:00
Aevann1 1236d7bcd5 fix "remove" button in /live 2022-10-08 08:13:35 +02:00
Aevann1 745184acc6 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-08 08:08:35 +02:00
Aevann1 acbfbb07ce rework "are you sure?" and make it work on subscribing to posts and reverting admin actions 2022-10-08 08:06:46 +02:00
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
justcool393 6df6054938 remove revert admin actions function 2022-10-07 20:48:37 -07:00
Aevann1 137fa7c6d6 remove unused blocks + allow banners to be expandable everywhere 2022-10-08 04:04:46 +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 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
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
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
justcool393 c4c3d6cf49
Merge branch 'frost' into permissions-refactor 2022-10-06 19:55:36 -07:00
Aevann1 3ecb1b4f9a generate a mod log for CCing or unCCing posts and notify OP 2022-10-07 04:48:31 +02:00
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
justcool393 35162a4899 submission: change ADMIN_HOME_VISIBLE permissions to can view post mod tools perm 
user: make so user can't moderate themselves at least in the UI
 2022-10-06 18:44:33 -07:00
Aevann1 e0b1d7968a fix prev commit 2022-10-07 03:35:21 +02:00
Aevann1 01071a20e8 add banner_thread to PCM 2022-10-07 03:32:08 +02:00
justcool393 9b705fc23e check proper permissions 2022-10-06 18:31:40 -07:00