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

20484 Commits (02efc44682912e556514ba136247a6d928d63dbd)

Author SHA1 Message Date
justcool393 02efc44682 pins: reintroduce bug/feature at @Aevann1's request 
the old behavior was actually to let admins bypass the limit, but this was buggy when the new multi pin thing was added and wouldn't let jannies make permapins if pins were at the limit
to make the code clear though, the permission name has been changed
 2022-11-01 15:14:11 -05:00
Aevann1 284002d7a4 dont allow admins to not select a badge 2022-11-01 22:12:05 +02:00
Aevann1 4494616d7a restore readme to the way I had it, fuck off geese 2022-11-01 22:10:17 +02:00
Aevann1 30144c46a4 cosmetic fix to !slots 2022-11-01 20:57:29 +02:00
SneedBot d43ee18a26 sneed 2022-11-01 18:24:26 +00:00
Aevann1 eb98740f97 fix users being unclickable in user_listing.html 2022-11-01 20:24:18 +02:00
Aevann1 eed9ea6fb8 fix user search being broken 2022-11-01 20:21:46 +02:00
justcool393 d5812096af voting: allow voting to cause a user's DC balance to go negative 2022-11-01 12:50:01 -05:00
justcool393 1e9f9564dc commentsaverelationship 2022-11-01 12:19:21 -05:00
Snakes a76344f7d0
Fix submission listing actions covered by link. 2022-11-01 06:06:54 -04:00
Snakes c95f5a537a
Fix "Copy link" action not including domain. 2022-11-01 06:06:45 -04:00
Snakes 5d6cb56075
Fix shop buy button widths. 2022-11-01 05:11:29 -04:00
justcool393 f326b9d5d7 port self removal from spooky-22 2022-11-01 04:01:51 -05:00
justcool393 62e171c09a fix mbux -> coins 2022-11-01 03:54:02 -05:00
justcool393 8bd637df57 leaderboards: use len 2022-11-01 03:04:56 -05:00
justcool393 08700a65b0 fix prev commit 2022-11-01 02:59:36 -05:00
justcool393 5c32713469 leaderboards: workaround jinja can't do this by setting a value for if v appears in ranking 2022-11-01 02:57:10 -05:00
justcool393 40a34ea26a leaderboards: don't show users if they're in the ranking more than once 2022-11-01 02:49:20 -05:00
justcool393 444b3d36f1 leaderboard: fix bug in table 2022-11-01 02:43:08 -05:00
justcool393 d7c7026792 leaderboards: fix missing </div> that was never present 
seriously someone copied and pasted the open div
 2022-11-01 02:36:18 -05:00
justcool393 72f9c1c877 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-11-01 02:21:58 -05:00
justcool393 e90edce28a leaderboard: fix bug with hat leaderboard 
in my defense, there was a lot of stuff
 2022-11-01 02:21:14 -05:00
justcool393 9048f5127d leaderboards: fix usernames in tables i think 
i'm not *happy* about this, something seems inelegant about this solution...
 2022-11-01 02:17:33 -05:00
Snakes 0ea738f1bc
Exclude limited-edition hats from profile counter. 2022-11-01 03:17:15 -04:00
SneedBot 0c8b0d531b
sneed 2022-11-01 02:45:46 -04:00
justcool393 55c8ce6e9d leaderboard: set value func in all cases 2022-11-01 01:36:41 -05:00
justcool393 02dde2a96f leaderboard: check for None explicitly instead of implicitly 
nonetype is used in only one case, if the value is implicitly falsey (like a 0) it can *potentially* cause issues
i have no idea how to repro this, apparently @Aevann1 was able to and it's a issue on rdrama.net, but not devrama or my own testing environment
 2022-11-01 01:28:18 -05:00
justcool393 d53c714bb7 users: use with_for_update() in charge_account 2022-11-01 01:14:18 -05:00
justcool393 6d636e4e42 use charge_account everywhere 2022-11-01 00:25:19 -05:00
justcool393 905b070437 twentyone: ratelimits: put a once per 2 seconds ratelimit to patch up race conditions 2022-11-01 00:04:55 -05:00
justcool393 769f20852b features: use AWARDS feature for awarding, not badges 2022-10-31 23:53:27 -05:00
justcool393 67b56fb743 users: fix comments page 2022-10-31 23:37:29 -05:00
SneedBot 6aabc98f62 sneed 2022-11-01 04:34:19 +00:00
gooseman dacf022c82 Update main.css 2022-10-31 21:33:52 -07:00
Snakes be2664b284
Revert "set astolfo background to everyone in drama" 
This reverts commit be1ff23d4d.
 2022-11-01 00:21:32 -04:00
Snakes 6f91e77338
Port sneeds from spooky-22. 2022-11-01 00:17:20 -04:00
Snakes d7aaa33c7f
Formalize unpurchasable hats. 2022-10-31 23:38:10 -04:00
justcool393 bfb13e9fec add a newline because posix users can't sneed 2022-10-31 19:14:24 -05:00
Aevann1 e7e667f56f fix undeflectable awards being vaporized 2022-11-01 02:11:44 +02:00
Aevann1 972578e74a allow poetrysperg to skip the linefeeds thing 2022-11-01 02:04:37 +02:00
Aevann1 f4542db86f fix first comment on a post being centered with huge padding 2022-11-01 01:12:31 +02:00
justcool393 b17ea4fd37 awards: only restrict admins if award feature flag set 2022-10-31 18:11:49 -05:00
Aevann1 5d9ff04ad3 fix last commit 2022-11-01 01:07:42 +02:00
Aevann1 3bfe3be800 fix /create_hole 2022-11-01 01:07:24 +02:00
Aevann1 48775dbb5d disallow jannies from undoing ban awards 2022-11-01 01:05:02 +02:00
Aevann1 ce2d90a212 small refactor to buttons on userpages 2022-11-01 00:43:18 +02:00
Snakes fa43317ee2
Revert "Merge pull request #396 from nekobbbbbbit/debooterstrap" 
This reverts commit ae1e6b01a4, reversing
changes made to 7e5c1b0ad8.
 2022-10-31 18:35:47 -04:00
Aevann1 e3a8f5eda6 disable "give award" button when number of owned selected awards goes to 0 2022-10-31 23:10:04 +02:00
Aevann1 cda0b3592c make journoid blurb acquisition announcement temporarily 2022-10-31 22:54:56 +02:00
Aevann1 7f82a0c371 add "Official site of /r/SubredditDrama" to the journoid blurbs 2022-10-31 22:53:11 +02:00