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

19732 Commits (1ad12e05241d49a0c5738b16d0056650d5b4790b)

Author SHA1 Message Date
justcool393 1ad12e0524 deduplicate more of this page's code 2022-10-08 23:44:09 -07:00
justcool393 13446a4708 remove duplicate code in the template 2022-10-08 21:26:41 -07:00
Snakes cf1844d6a4
Fix hat counter logic breaking Simps listing. 2022-10-08 23:55:40 -04:00
Aevann1 5c92432ab7 sneed 2022-10-09 00:00:09 +00: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
Aevann1 b4ab5a2233 sneed 2022-10-08 20:00:06 +00:00
justcool393 360723f761 num hats fix (and pct fix too?) 2022-10-08 10:53:54 -07: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 7025cbe983 don't include sbed users in songs 2022-10-08 10:14:17 -07:00
Aevann1 83f4e6e397 sneed 2022-10-08 16:03:49 +00: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 55c62b820f fix grammar 2022-10-08 08:08:45 +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
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