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

14772 Commits (4abf75edc03ff4e2e5a4002e82d2b63897d7bace)

Author SHA1 Message Date
Aevann1 9ad4dbeaa7 cosmetic change 2022-09-10 02:25:53 +02:00
Aevann1 8943024e17 cosmetic change 2022-09-10 02:18:52 +02:00
Aevann1 c638c8be80 restore error codes 2022-09-10 02:17:31 +02:00
Aevann1 4c16aa2093 same as last commit 2022-09-10 02:15:06 +02:00
Aevann1 113791ca69 fix pasting images in /submit/marseys 2022-09-10 02:14:09 +02:00
Aevann1 36a4c7d7f4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-10 00:07:26 +00:00
Aevann1 7a8395fefb better feedback in /submit/marseys 2022-09-10 02:07:17 +02:00
Aevann1 41e18ee32d sneed 2022-09-10 00:00:02 +00:00
Aevann1 630567f176 fix /submit_marseys for classic theme users 2022-09-10 01:57:45 +02:00
Aevann1 6d0d3c07d0 make new casino respect rehab award 2022-09-10 01:55:13 +02:00
Aevann1 53dbe018de update megathread_index again 2022-09-10 01:53:09 +02:00
Aevann1 00b71e0bc5 restore the original emoji icon 2022-09-10 01:52:52 +02:00
Aevann1 891a021936 fix expanding pfp on mobile 2022-09-10 01:46:46 +02:00
Aevann1 cfbe17a01c fix link 2022-09-10 01:44:30 +02:00
Aevann1 fbbb2c2ceb marsey submission stuff 2022-09-10 01:41:54 +02:00
Aevann1 e0d4a03934 trying to fix 500 error 2022-09-10 01:35:04 +02:00
Aevann1 ac80fecf25 fix 2022-09-10 01:32:12 +02:00
Aevann1 42ce3b0f80 "Select File" -> "Select Image" 2022-09-09 11:47:14 +02:00
Aevann1 45e49770f5 cosmetic 2022-09-09 11:44:49 +02:00
Aevann1 9419032201 useless commit 2022-09-09 11:41:08 +02:00
Aevann1 5076859817 marsey UI stuff 2022-09-09 11:39:03 +02:00
Aevann1 500c1ba3c1 check filetype (thx drT) 2022-09-09 11:31:11 +02:00
Aevann1 acf6ca7d74 remove sidebar background (I hate it) 2022-09-09 11:28:59 +02:00
Aevann1 91f3069001 more marsey shit 2022-09-09 11:21:17 +02:00
Aevann1 b8cde6ca60 restrict approving and rejecting marseys to the fish 2022-09-09 11:15:16 +02:00
Aevann1 47890d771d add Marsey Submission UI 2022-09-09 11:13:50 +02:00
Aevann1 d75fcc4bdc cosmetic change 2022-09-09 08:50:59 +02:00
Aevann1 77128f54f8 adjust bite award logic 2022-09-09 08:49:05 +02:00
Aevann1 f17192e68b cosmetic change 2022-09-09 08:46:10 +02:00
Aevann1 2b467c7f77 remove 3 bad sidebar images 2022-09-09 08:41:06 +02:00
Aevann1 a306193e90 increase pin award price from 1k to 1500 2022-09-09 08:37:58 +02:00
Aevann1 ff575c9eea JL3 no longer mod holes 2022-09-09 08:37:25 +02:00
Aevann1 a96535cbde Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-09 08:37:06 +02:00
Aevann1 75060fdee4 fix "exile user" margin 2022-09-09 08:37:04 +02:00
Aevann1 dcdf37b626 sneed 2022-09-09 00:00:02 +00:00
Aevann1 362e4e049c sneed 2022-09-08 22:00:02 +00:00
Aevann1 23338e8172 try to fix the wrong method error on giving awards 2022-09-08 21:21:41 +02:00
Aevann1 66bf74b444 fix whoopsie 2022-09-08 21:16:57 +02:00
Aevann1 485c30ec3c relax ratelimit on buying awards 2022-09-08 21:14:02 +02:00
Aevann1 90551bc143 tryna fix new_comment_count 2022-09-08 21:08:42 +02:00
Aevann1 1ce1410268 show total number of hats in /hats 2022-09-08 20:36:43 +02:00
Aevann1 6077f09ca9 make bets better 2022-09-08 20:25:45 +02:00
Aevann1 6e1b454d1c fix last commit 2022-09-08 19:57:20 +02:00
Aevann1 40b4aff0e8 same as last commit 2022-09-08 19:51:03 +02:00
Aevann1 e382334c53 add description to new badge messages 2022-09-08 19:48:56 +02:00
Aevann1 28aaf15d85 fix bird award icon 2022-09-08 19:41:37 +02:00
Aevann1 17fabb423a cosmetic fix 2022-09-08 19:32:02 +02:00
Aevann1 2ceeec26b7 cosmetic fix 2022-09-08 19:30:22 +02:00
Aevann1 4791e7b14b revert icon change 2022-09-08 19:24:00 +02:00
Aevann1 e9445efc22 make bootstrap work on localhost 2022-09-08 19:12:46 +02:00
Aevann1 d22240160c testing on devrama 2022-09-08 18:46:45 +02:00
Aevann1 adf271f8b6 same as last commit 2022-09-08 18:21:43 +02:00
Aevann1 a52563e20d Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-08 18:19:48 +02:00
Aevann1 8bdfa6c826 cosmetic change 2022-09-08 18:19:46 +02:00
Aevann1 2c188f3055 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-08 16:11:56 +00:00
Aevann1 26535c4b25 cosmetic change 2022-09-08 18:11:44 +02:00
Aevann1 2038922513 cosmetic shit 2022-09-08 18:02:53 +02:00
Aevann1 128400d259 sneed 2022-09-08 16:00:02 +00:00
Aevann1 14f8a3f261 fix 2022-09-08 17:53:16 +02:00
Aevann1 615d18c41b like last commit 2022-09-08 17:49:34 +02:00
Aevann1 4d3a76f686 vamp award adjust 2022-09-08 17:46:01 +02:00
Aevann1 f23912bc5b cosmetic shit 2022-09-08 17:45:10 +02:00
Aevann1 f4e4ff3839 comsetic shit 2022-09-08 17:38:27 +02:00
Snakes e1c44d99d5
cron.py: hole inactivity criteria, stealth fix. 
Two bugs:
  1) Drafts, deleted posts, and removed posts counted toward hole
     aliveness. This has been fixed.
  2) Foreign key constraints in sub_joins weren't getting deleted,
     so stealth holes couldn't be deleted.

Both of these conspired to keep /h/smuggies alive, so they must be
fixed.
 2022-09-07 18:29:40 -04:00
Aevann1 e9b52cf1ca
Update assetcache.html 2022-09-07 11:27:00 +02:00
Aevann1 bc6827826a
Update main.css 2022-09-07 11:26:26 +02:00
Aevann1 62a2a4d632 same as last commit 2022-09-07 08:50:33 +02:00
Aevann1 be53d04d65 fix pp20 2022-09-07 08:41:08 +02:00
Aevann1 057dfc7d80 upgrade to ubuntu 22.04 2022-09-07 07:51:05 +02:00
Aevann1 4760aed187 fix rainbow-text on drambler and 4chan themes, thanks hbtz 2022-09-07 06:53:50 +02:00
Aevann1 5363aa67c6 do this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2672411?context=8#context 2022-09-07 06:28:02 +02:00
Aevann1 9475aa27e4 award badges shit 2022-09-07 05:31:55 +02:00
Aevann1 d695755aa2 sneed 2022-09-07 03:00:02 +00:00
Aevann1 05bacd1efc change reporting flow 2022-09-07 03:22:40 +02:00
Aevann1 bc2d1fb53f disable save_edit button on click 2022-09-07 03:13:28 +02:00
Aevann1 66d3e18263 do this https://rdrama.org/h/femboy/post/101152/re-marsify-award/2670658?context=8#context 2022-09-07 00:39:34 +02:00
Aevann1 043a235082 buff vamp house award again 2022-09-07 00:35:05 +02:00
Aevann1 71f3a2c24c buff vamp house award 2022-09-07 00:25:29 +02:00
Aevann1 7102d4744f css was a mistake 2022-09-07 00:15:22 +02:00
Aevann1 7bbbb117d1 testing on devrama.net 2022-09-07 00:00:58 +02:00
Aevann1 13760d92f8 fix award modal on mobile permenantly 2022-09-06 23:51:15 +02:00
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02:00
Aevann1 5e0e58793d Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-06 22:31:34 +02:00
Aevann1 79ee12252d fix earlier bad replace-all 2022-09-06 22:31:31 +02:00
Snakes b568ea51a8
Fix "Create Post" appearing on /search. 
Also think this is the last template that was extending home.html when
extending default.html would be more proper.
 2022-09-06 03:17:30 -04:00
Aevann1 833a74749e remove pfp borders 2022-09-06 09:09:02 +02:00
Aevann1 d8ae07c060 same as last commit 2022-09-06 09:05:18 +02:00
Aevann1 480c38ba44 cosmetic change to popover pfp 2022-09-06 09:03:14 +02:00
Aevann1 d930141dc5 same as last commit 2022-09-06 06:54:59 +02:00
Aevann1 1d419640a3 make deflector unaffect me 2022-09-06 06:53:49 +02:00
Aevann1 8e4866e43d forgot to add rainbow expiry code 2022-09-06 06:51:53 +02:00
Aevann1 199ab85b1c make it even better 2022-09-06 06:39:27 +02:00
Aevann1 dd2c714b9d make rainbow-text look better, THANK YOU HBTZ <3 2022-09-06 06:36:48 +02:00
Aevann1 10650aaa44 fix rainbow on post titles that link to shit 2022-09-06 06:26:36 +02:00
Aevann1 8d5a358ac5 fix 2022-09-06 06:23:15 +02:00
Aevann1 d0cfd8a8c1 change house femboy award 2022-09-06 06:16:41 +02:00
Aevann1 4ca6cda0e5 hats everywhere 2022-09-06 05:51:55 +02:00
Aevann1 7cc1b64801 just realized I cant go back now 2022-09-06 05:40:49 +02:00
Aevann1 2dd9bd59a0 I cachebusted the wrong theme 2022-09-06 05:21:31 +02:00
Aevann1 cfa2a31328 make the border for posts less pronounced on dark theme 2022-09-06 05:20:00 +02:00
Aevann1 5e3ecec61a link followers in position row in leaderboard 2022-09-06 05:08:28 +02:00
Aevann1 2005eb1bce leaderboard 2022-09-06 05:06:41 +02:00
Aevann1 0eb0e4ed5c experimenting w/ leaderboard 2022-09-06 04:58:04 +02:00
Aevann1 2717b93555 leaderboard cancer 2022-09-06 04:52:03 +02:00
Aevann1 d68ffeadb6 Revert "leaderboard cancer, don't read if u value ur sanity" 
This reverts commit b1933def96.
 2022-09-06 04:43:28 +02:00
Aevann1 a19d700c8d up ratelimit for adding mods 2022-09-06 04:40:46 +02:00
Aevann1 b1933def96 leaderboard cancer, don't read if u value ur sanity 2022-09-06 04:40:11 +02:00
Aevann1 5c854adc20 show urself in blocker users table 2022-09-06 04:13:43 +02:00
Aevann1 04aab7ff0f show ppl's pfps under hats 2022-09-06 03:49:14 +02:00
Aevann1 65d35bca4b show ppls' pfps under hats 2022-09-06 03:47:14 +02:00
Aevann1 c354f0da9b minor cosmetic change 2022-09-06 01:37:06 +02:00
Aevann1 f8cd1bea03 make the poll code much worse 2022-09-06 01:33:58 +02:00
Aevann1 ed60cafb24 make the poll code make a little more sense 2022-09-06 00:56:21 +02:00
Aevann1 da52d00ad3 fix 500 errors 2022-09-06 00:55:26 +02:00
Aevann1 ef5c3c89ee deduplicate polls 2022-09-06 00:55:01 +02:00
Aevann1 62d077576f change poll- and choice- and -bet to -option 2022-09-06 00:54:05 +02:00
Aevann1 73dbb2dd7e change t2_ and t3_ to p_ and c_ 2022-09-06 00:52:22 +02:00
Aevann1 8085de14e4 make only house members able to vote on polls in their house hole 2022-09-06 00:30:44 +02:00
Aevann1 185fc04101 followers table 2022-09-06 00:02:08 +02:00
Aevann1 ae0dd18192 fix 500 error 2022-09-05 23:58:46 +02:00
Aevann1 c15e0f6fad show follow time 2022-09-05 23:52:56 +02:00
Aevann1 de46a6e519 fix 2022-09-05 23:43:36 +02:00
Aevann1 28e9064e28 agony 2022-09-05 23:33:57 +02:00
Aevann1 3f54b065fa small modification 2022-09-05 23:28:05 +02:00
Outrun Colors 90507fc8e5 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-05 15:59:48 -05:00
Outrun Colors 3509d6a8b1 Implement a function to fix bad blackjack games 2022-09-05 15:59:42 -05:00
Aevann1 1f0e7f6f66 show followers in leaderboard too 2022-09-05 22:43:49 +02:00
Aevann1 7404d94610 fix issues for new instances 2022-09-05 22:37:38 +02:00
Aevann1 e793a1ab3a show a list of blockers 2022-09-05 22:23:35 +02:00
Aevann1 0f232b264c refactor torture_ap 2022-09-05 22:05:04 +02:00
Aevann1 26e28efbec Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-05 21:46:06 +02:00
Aevann1 4dc7e73499 strip emoji search input 2022-09-05 21:46:04 +02:00
Outrun Colors 4e2a220498 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-05 13:27:06 -05:00
Outrun Colors b1674355c0
Restructure blackjack to only use a single endpoint and better handle "game end" logic 2022-09-05 13:27:00 -05:00
Aevann1 b0016143e5 sneed 2022-09-05 18:00:02 +00:00
Aevann1 6ae4459063 sneed 2022-09-05 14:00:03 +00:00
Aevann1 8c1ceee1ac sneed 2022-09-05 13:00:02 +00:00
Aevann1 b364838ad5 wtf 2022-09-05 11:07:01 +02:00
Aevann1 514e67a454 THERE SHOULDN'T BE CONCURRENT BLACKJACK GAMES BY SAME USER 2022-09-05 10:59:30 +02:00
Aevann1 919f49ccb2 small css modification 2022-09-05 10:58:59 +02:00
Aevann1 6d37838f45 fix 500 error 2022-09-05 10:57:21 +02:00
Aevann1 9bf2d75bce fix chat hats 2022-09-05 10:57:11 +02:00
Aevann1 959e08bb83 make marsify not count towards /marseys 2022-09-05 10:49:34 +02:00
Aevann1 e2c7e2939f fix leaderboard 2022-09-05 10:42:04 +02:00
Aevann1 f6be11bc98 fix prev commit 2022-09-05 10:32:52 +02:00
Aevann1 93d7c91ce7 add the ability to order hats by author username 2022-09-05 10:27:37 +02:00
Aevann1 7785f049ec fix 500 error 2022-09-05 10:00:12 +02:00
Aevann1 b166fdcaf3 make hat designers gets their own hat for free 2022-09-05 09:59:24 +02:00
Aevann1 64f95f1fca sneed 2022-09-05 09:48:54 +02:00
Aevann1 9d6c6d88a0 remove unnecessary attribute 2022-09-05 09:40:49 +02:00
Aevann1 8fb22a397c dont use g.db.execute 2022-09-05 09:37:20 +02:00
Aevann1 22c65f74da reduce minimum gambling amount from 100 to 5 2022-09-05 09:28:53 +02:00
Aevann1 e9f9756f16 leaderboard shit 2022-09-05 09:26:12 +02:00
Aevann1 6f9265a711 Revert "testing on prod" 
This reverts commit e1a71486f7.
 2022-09-05 09:01:04 +02:00
Aevann1 e1a71486f7 testing on prod 2022-09-05 08:57:56 +02:00
Aevann1 aae9389b23 comment "push" and "blackjack" 2022-09-05 08:50:18 +02:00
Aevann1 e554f0924b try fixing blackjack 2022-09-05 07:15:42 +02:00
Aevann1 225e64b91e add marsify toggle in settings 2022-09-05 06:50:27 +02:00
Aevann1 e6d5839e4d fix chat 2022-09-05 06:38:01 +02:00
Aevann1 3eddb8f391 more hat shit 2022-09-05 06:36:31 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 15732114d9 try making hats work in popover 2022-09-05 06:21:06 +02:00
Aevann1 b3b6f1cf34 add hats to all pp20 2022-09-05 06:00:19 +02:00
Aevann1 eb3dd36b59 add hats to a leaderboard table 2022-09-05 05:57:30 +02:00
Aevann1 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 1816ce09f7 make it possible to equip multiple hats 2022-09-05 05:44:24 +02:00
Aevann1 82237ca585 fix prev commit 2022-09-05 05:17:40 +02:00
Aevann1 fef15b7da9 fix prev commit 2022-09-05 05:16:42 +02:00
Aevann1 f516f21ed3 fix prev commit 2022-09-05 05:15:00 +02:00
Aevann1 2636ae62c2 add hats to chat (Part II) 2022-09-05 05:14:03 +02:00
Aevann1 093ed82fb8 fix prev commit 2022-09-05 05:06:25 +02:00
Aevann1 49bcd0543d add hats to chat, part I 2022-09-05 05:04:48 +02:00
Aevann1 332a03219b add hats to most tables 2022-09-05 05:01:06 +02:00
Aevann1 fe7f0316f7 flush before game query 2022-09-05 04:41:08 +02:00
Aevann1 11b391c437 fix blackjack when hitting blackjack 2022-09-05 04:34:30 +02:00
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +02:00
Aevann1 d51869e20a sneed 2022-09-05 01:57:26 +00:00
Aevann1 b0010a455d highlight mobile nav bar icons on click 2022-09-05 03:51:29 +02:00
Aevann1 6727d4005c better stripping syntax 2022-09-05 03:44:38 +02:00
Aevann1 0271d4488f do this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2658067?context=8#context 2022-09-05 03:43:07 +02:00
Aevann1 531525a254 Revert "set height and width for hats" 
This reverts commit c53418d50a.
 2022-09-05 02:57:24 +02:00
Aevann1 c53418d50a set height and width for hats 2022-09-05 02:55:03 +02:00
Aevann1 cade131aa6 cachebust hats 2022-09-05 02:52:52 +02:00
Aevann1 cf5012aa35 blackjack fix (I hope) 2022-09-05 02:38:35 +02:00
Aevann1 1242a2d009 change casino icon and more cachebusting 2022-09-05 02:10:44 +02:00
Aevann1 fb4f43d2fb increase gambling ratelimit 2022-09-05 02:01:16 +02:00
Aevann1 71b5367874 cachebust all css and js 2022-09-05 01:50:43 +02:00
Aevann1 97e3614072 fix 500 error 2022-09-05 01:39:56 +02:00
Aevann1 a0e3d75f3e same as last commit 2022-09-05 01:37:39 +02:00
Aevann1 92a134c28f fix PWA prompt not working for logged-in users 2022-09-05 01:37:01 +02:00
Aevann1 842300ac6e remove code irrelevant now (not broken this time I hope) 2022-09-05 01:21:48 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
Aevann1 554c53633c fix again 2022-09-05 00:32:17 +02:00
Aevann1 1a5647d44b fix again 2022-09-05 00:30:32 +02:00
Aevann1 881dc51a44 fix again 2022-09-05 00:29:26 +02:00
Aevann1 b29f456242 fix again 2022-09-05 00:27:23 +02:00
Aevann1 9d57ce9b6b fix pfps not working in /leaderboard 2022-09-05 00:25:22 +02:00
Aevann1 57dcd0ddef remove snappy gambling 2022-09-05 00:13:23 +02:00
Aevann1 1470b2c8cc Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-05 00:07:22 +02:00
Aevann1 63b48e0687 cachebust 2022-09-05 00:07:20 +02:00