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

9264 Commits (fbd815f54ea2838796d4dda929fbeb9bc92a48b6)

Author SHA1 Message Date
Aevann1 6966b5328c Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-16 20:28:37 +02:00
Aevann1 fea5ee75eb try to fix pusher 2022-09-16 20:28:35 +02:00
gooseman 3a867c6f29 fix unread on classic theme 2022-09-16 11:11:33 -07:00
Snakes 78bed8e66a
chat: extend b845c3f style changes to scrollback. 2022-09-16 11:00:43 -04:00
Snakes b845c3fe23
chat: right-align message deletion button. 2022-09-16 10:20:38 -04:00
Aevann1 b30b291baf dark hcaptcha :marseysoypoint: (thx drT) 2022-09-16 15:15:17 +02:00
Aevann1 0923460ea1 fix prev commit 2022-09-16 15:01:25 +02:00
Aevann1 33634d360c dont show chudrama's sidebar pic to ppl under 5000 truescore 2022-09-16 15:00:45 +02:00
Aevann1 b647e3a46a cosmetic change 2022-09-16 11:26:08 +02:00
gooseman aa2a4f4d05 classic dark rework + classic touchups 2022-09-15 18:45:31 -07:00
Aevann1 74db58e54b Revert "WPD: enable rotating sidebar art & admin thread." 
This reverts commit 5ddf1c979a.
 2022-09-14 16:16:27 +02:00
Aevann1 99000e7bd9 fix margins 2022-09-14 16:12:01 +02:00
Aevann1 d14612c7f0 fix 2022-09-14 13:45:41 +02:00
Aevann1 c3c7b20ccd fix wrong syntax 2022-09-14 13:44:16 +02:00
Aevann1 af2b69d7bb "yes but could you make it that it resets when i click on anything but the trashcan?" 2022-09-14 13:42:25 +02:00
Aevann1 f2da6ce091 fix prev commit 2022-09-14 13:31:14 +02:00
Aevann1 e4a2e28ba3 fix prev commit 2022-09-14 13:28:51 +02:00
Aevann1 56a7347fc1 add confirmation for chat msg deletion 2022-09-14 13:25:00 +02:00
Aevann1 a6ce6135d8 fix 2022-09-14 13:00:46 +02:00
Aevann1 c2f397df40 show the original file in /marseys 2022-09-14 12:55:35 +02:00
Aevann1 a567e71767 smaller expanded image on desktop 2022-09-14 11:52:23 +02:00
Aevann1 135bd2c60c remove unnecessary gay shit 2022-09-14 11:20:59 +02:00
Aevann1 65d396a499 kofi 2022-09-14 10:28:01 +02:00
geese-suck a800363d70
Update assetcache.html 2022-09-13 21:28:38 -07:00
outruncolors 3ebccf35d1
Add order page (#353) 
* Add order page route

* Initial backend post route

* Move to static and prevent logged in users

* Update files/routes/static.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Make requested changes

* Last snake changes

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-13 21:21:25 -05:00
gooseman caf495516b completely rehaul classic theme 
classic dark to come when i feel like it lol
 2022-09-13 14:55:59 -07:00
Aevann1 c13a1524fa dramacoin -> coin 2022-09-13 22:46:08 +02:00
Aevann1 1f79a563bf dramacoins -> coins 2022-09-13 22:13:58 +02:00
Aevann1 df2de5f087 rearrange 2022-09-13 21:44:06 +02:00
Aevann1 af66453f2b fix NaN on gifting on mobile 2022-09-13 19:45:00 +02:00
Aevann1 dff5bcefcf add loop.index to vote tables 2022-09-13 19:35:33 +02:00
Aevann1 2fa71a252b kofi integration 2022-09-13 18:53:19 +02:00
Aevann1 9f6ec11cd4 remove unnecessaryu block from bootstrap.js 2022-09-13 13:05:13 +02:00
Aevann1 d3e8a7f86c perserve asset_submission fields on error 2022-09-13 13:00:47 +02:00
Aevann1 cda73fe9d4 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2709344?context=8#context 2022-09-13 12:47:50 +02:00
Aevann1 f88aa5de14 cosmetic change 2022-09-13 12:44:21 +02:00
Aevann1 39dfd05a27 move "donate" up 2022-09-13 12:31:26 +02:00
Aevann1 94ed6a2d38 blocking adjustments 2022-09-13 12:27:28 +02:00
Aevann1 3db7be4d61 casino constitency 2022-09-13 08:59:39 +02:00
Aevann1 5b7dc29445 sneed 2022-09-13 06:00:02 +00:00
Outrun Colors fec1ba8438
Use correct number and not index for color 2022-09-12 22:29:19 -05:00
Outrun Colors a7ab4523de
Skip winners on 0 and 00 2022-09-12 22:14:55 -05:00
Outrun Colors 947d097087
Make poker chips a circle 2022-09-12 21:04:32 -05:00
outruncolors 7d8cfe5576
Add Roulette (#351) 
* Add roulette file

* Rename variable to avoid name collission

* Add basic route and create new template for game

* More work on the roulette template

* Initial connection of front-end roulette to back-end roulette

* Add to cron job

* Pass bets to the front end

* Update front-end looks

* Add stackable poker chips for bets

* Minor last changes

* Handle minimum bets

* Add bet table
 2022-09-12 20:07:39 -05:00
Aevann1 8ca494f7c2 add limits in oauth apps page 2022-09-12 19:40:53 +02:00
Aevann1 7e811b47fb reporting improvement 2022-09-12 11:48:01 +02:00
Aevann1 2ffe0d527e notif color consistency 2022-09-12 11:36:49 +02:00
Aevann1 be2ff53d85 mass trim badges 2022-09-12 11:31:04 +02:00
Aevann1 46e7be0c0b mass trim sidebar images 2022-09-12 11:28:12 +02:00
Aevann1 3dc755e5a0 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705957?context=8#context 2022-09-12 09:53:01 +02:00
Aevann1 56c4f8ccf0 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705881?context=8#context 2022-09-12 09:34:12 +02:00
Aevann1 512cedc2b6 fix prev commit 2022-09-12 09:19:50 +02:00
Aevann1 ee756bf4b6 minor submission changes 2022-09-12 09:17:57 +02:00
Aevann1 c057d1baf1 cosmetic change 2022-09-12 09:11:18 +02:00
Aevann1 5804a93b11 cosmetic change 2022-09-12 07:38:02 +02:00
Aevann1 2e31b52366 for consistency's sake, don't use {sub.name} inside strings anymore 2022-09-12 07:25:04 +02:00
Aevann1 eb69b039a0 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705620?context=8#context 2022-09-12 07:23:16 +02:00
Aevann1 41dac65e9c fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2702071?context=8#context 2022-09-12 07:05:11 +02:00
Aevann1 73ff78d0f5 fix 1st part of this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705204?context=8#context 2022-09-12 06:38:04 +02:00
Aevann1 ce0b141325 specify the type of color code we want 2022-09-11 12:04:21 +02:00
Aevann1 691857b805 cosmetic change 2022-09-11 11:59:39 +02:00
Aevann1 0e299656b2 cosmetic change 2022-09-11 11:49:19 +02:00
Aevann1 99f6d8d468 cosmetic change 2022-09-11 11:48:35 +02:00
Aevann1 00ad36a98b cosmetic change 2022-09-11 11:46:37 +02:00
Aevann1 b0fd3dc5b6 cosmetic change 2022-09-11 11:45:25 +02:00
Aevann1 b840a69f02 cosmetic change 2022-09-11 11:44:12 +02:00
Aevann1 40558765db cosmetic change 2022-09-11 11:41:52 +02:00
Aevann1 0c1ea35137 make highlights consistent 2022-09-11 11:16:45 +02:00
Aevann1 4bec67c15a small cosmetic change 2022-09-11 11:14:53 +02:00
Aevann1 9c8bc0fdd6 allow ppl blocked by someone to visit that someone's profile 2022-09-11 10:57:06 +02:00
Aevann1 b0057483c8 link the admigger upload threads in the admin panel for easier access 2022-09-11 09:11:10 +02:00
Aevann1 fac017bea1 "rDrama.net Casino" -> "Casino" 2022-09-11 09:03:52 +02:00
Aevann1 fda1f1e562 allow asset submitters to remove their pending shit 2022-09-11 09:03:34 +02:00
Aevann1 aefc3703ce remove unnecessary id 2022-09-11 08:46:49 +02:00
Aevann1 cd79a86b99 same as last commit 2022-09-11 08:45:43 +02:00
Aevann1 3e6a3ef52d expose the pngs 2022-09-11 08:41:28 +02:00
Aevann1 98192c7b00 add white border to images in /sumbit 2022-09-11 08:33:36 +02:00
Aevann1 9c473d899f fix pcm casino 2022-09-11 06:49:33 +02:00
Aevann1 4edeb5ed2b same as last commit 2022-09-11 06:11:25 +02:00
Aevann1 3b515e0e33 fix notifs margins 2022-09-11 06:10:29 +02:00
Aevann1 fd6e8fc4b1 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2694340?context=8#context 2022-09-11 05:59:11 +02:00
Aevann1 d794816943 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2694421?context=8#context 2022-09-11 05:57:22 +02:00
Aevann1 1fb897a309 move notif messages tab 2022-09-11 03:46:18 +02:00
outruncolors d57a569125
[DO NOT MERGE] Casino changes (#350) 
* Merge up

* Create composable template for casino games

* Big changerinos

* Only allow double down sometimes

* Add drawing capability

* Make everything pretty

* Add leaderboard

* Update files/routes/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Add some stuff

* Rehab screen

* Default sets for no games

* Stupid revert

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-10 16:01:34 -05:00
Snakes b8675977b6
Show sidebar on all posts, including unholed. 2022-09-10 14:46:10 -04:00
Snakes a0bd960b19
Add hat template link to submit_hats. 2022-09-10 14:45:10 -04:00
Aevann1 48e1c653db 2 folders instead of prefixes 2022-09-10 13:07:58 +02:00
Aevann1 4d7a53d6ea cosmetic fix 2022-09-10 11:44:06 +02:00
Aevann1 bd7c0e71bf forgot to cachebust 2022-09-10 11:34:48 +02:00
Aevann1 8f0b2ea9c3 test on devrama 2022-09-10 11:31:51 +02:00
Aevann1 c968b1a4df remove element instead of hiding it 2022-09-10 11:31:43 +02:00
Aevann1 5824385589 more commas in leaderboard 2022-09-10 11:01:53 +02:00
Aevann1 57247b2fbc more commas 2022-09-10 10:47:16 +02:00
Aevann1 b99cc4a8aa remove surgical tools I forgot in the patient's body 2022-09-10 10:42:17 +02:00
Aevann1 c1aae95d16 restore "notify followers" checkbox 2022-09-10 09:00:45 +02:00
Aevann1 34aaed8045 add commas to numbers 2022-09-10 08:43:38 +02:00
Aevann1 b6cd2a839e same as last commit 2022-09-10 08:22:59 +02:00
Aevann1 e962f2fc73 change terminology 2022-09-10 08:22:45 +02:00
Aevann1 0ddacad599 add prefixes for asset_submissions 2022-09-10 07:49:39 +02:00
Aevann1 1a64ba3db8 hat submission UI 2022-09-10 07:37:11 +02:00
Aevann1 faac45b425 allow carp to change marsey name 2022-09-10 06:36:24 +02:00
Aevann1 ad7c8e1461 switch order of buttons 2022-09-10 06:27:04 +02:00
Aevann1 770e818d67 add telegram links 2022-09-10 05:52:56 +02:00
Aevann1 e118ca3555 restore hole stats 2022-09-10 05:26:27 +02:00
Aevann1 77a0a83bed I give up 2022-09-10 05:16:00 +02:00
Aevann1 3501a917bb last test 2022-09-10 05:14:39 +02:00
Aevann1 d2186258c2 test on devrama 2022-09-10 05:12:19 +02:00
Aevann1 9b72491937 same ast last commit 2022-09-10 05:07:29 +02:00
Aevann1 07d0d328e8 testing on devrama 2022-09-10 05:07:19 +02:00
Aevann1 b712b93c6e useless commit but just in case 2022-09-10 03:54:03 +02:00
Aevann1 8e6fc96135 testing on devrama 2022-09-10 03:42:13 +02:00
Aevann1 30bdee98b2 fix comment level 10 bug, thanks @everyone 2022-09-10 02:47:48 +02:00
Snakes ad31fe854b
DMs: add unread indicator, sort by recent reply. 2022-09-09 20:30:56 -04:00
Aevann1 9ad4dbeaa7 cosmetic change 2022-09-10 02:25:53 +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 7a8395fefb better feedback in /submit/marseys 2022-09-10 02:07:17 +02:00
Aevann1 630567f176 fix /submit_marseys for classic theme users 2022-09-10 01:57:45 +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 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 5076859817 marsey UI stuff 2022-09-09 11:39:03 +02:00
Aevann1 acf6ca7d74 remove sidebar background (I hate it) 2022-09-09 11:28:59 +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 f17192e68b cosmetic change 2022-09-09 08:46:10 +02:00
Aevann1 75060fdee4 fix "exile user" margin 2022-09-09 08:37:04 +02:00
Aevann1 23338e8172 try to fix the wrong method error on giving awards 2022-09-08 21:21:41 +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 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 8bdfa6c826 cosmetic change 2022-09-08 18:19:46 +02: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 14f8a3f261 fix 2022-09-08 17:53:16 +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
Aevann1 e9b52cf1ca
Update assetcache.html 2022-09-07 11:27:00 +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 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 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 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
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 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 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 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 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 185fc04101 followers table 2022-09-06 00:02:08 +02:00
Aevann1 c15e0f6fad show follow time 2022-09-05 23:52:56 +02:00
Aevann1 28e9064e28 agony 2022-09-05 23:33:57 +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 e793a1ab3a show a list of blockers 2022-09-05 22:23:35 +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 b1674355c0
Restructure blackjack to only use a single endpoint and better handle "game end" logic 2022-09-05 13:27:00 -05:00
Aevann1 b364838ad5 wtf 2022-09-05 11:07:01 +02:00
Aevann1 919f49ccb2 small css modification 2022-09-05 10:58:59 +02:00
Aevann1 9bf2d75bce fix chat hats 2022-09-05 10:57:11 +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 9d6c6d88a0 remove unnecessary attribute 2022-09-05 09:40:49 +02:00