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

15109 Commits (495cc60a26ded6a8f817d5a8b0df5afed28c97fa)

Author SHA1 Message Date
Aevann1 495cc60a26 fix /live 2022-09-23 00:27:38 +02:00
Aevann1 ada5ab61a6 validate inputted channel id 2022-09-23 00:02:15 +02:00
Aevann1 2ef91698f4
allow PCM chadmins to add or remove channels (#365) 
* testing on devrama

* fix for devrama

* fix

* fix

* fix

* fix

* fix

* fix

* test

* fix

* test

* test

* commit
 2022-09-22 23:40:32 +02:00
Aevann1 bf5abefc4c remove tarded banner 2022-09-22 22:51:25 +02:00
Aevann1 cd5d0c7c92 dont archive rdrama.org 2022-09-22 22:45:26 +02:00
Aevann1 639220f05d add marseygeorge.webp 2022-09-22 22:34:08 +02:00
Aevann1 618572e413 reload on declaring winner 2022-09-22 22:24:22 +02:00
Aevann1 c12f7a5f9a commit before rendering 2022-09-22 22:20:29 +02:00
Aevann1 d80a2f2331 add "are you sure?" to "declare winner" 2022-09-22 22:11:56 +02:00
Aevann1 6eea792b00 if ur reading this, fuck you 2022-09-22 21:54:42 +02:00
Aevann1 0d760697db Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-22 19:42:17 +00:00
Aevann1 f9fdeed771 fix 2022-09-22 21:42:09 +02:00
Aevann1 fe7e8761f6 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-22 19:40:23 +00:00
Aevann1 8a8a67a059 remove ban_evade logic 2022-09-22 21:40:14 +02:00
Aevann1 291bd53f61 sneed 2022-09-22 19:00:03 +00:00
Aevann1 40cd38d052 add padding to /live 2022-09-22 20:35:25 +02:00
Aevann1 ce30fa4064 add border-radius to streamer thumbnails 2022-09-22 20:30:51 +02:00
Aevann1 512d906970 slow down the blinking 2022-09-22 20:26:31 +02:00
Aevann1 5c7ff17512 remove "/live" from url for offline streamesr 2022-09-22 20:26:06 +02:00
Aevann1 0df33c86a4 remove unnecessary deprected behavior in /distribute 2022-09-22 20:23:18 +02:00
Aevann1 640d120dca Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-22 07:26:50 +02:00
Aevann1 d8ac954d53 remove unnecessary execution of function 2022-09-22 07:26:48 +02:00
Aevann1 b462fac9b7 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-22 05:24:43 +00:00
Aevann1 70d7a4db31 add patyl 2022-09-22 07:24:34 +02:00
Aevann1 55ca68e6fb same as last commit 2022-09-22 07:17:16 +02:00
Aevann1 40485e9ab6 fix cron (im stoopid) 2022-09-22 07:15:55 +02:00
Aevann1 c02e1bd76f fix cron 2022-09-22 07:11:50 +02:00
Aevann1 9220424324 fix cron 2022-09-22 07:08:58 +02:00
Aevann1 77fa9de79a fix cronjob 2022-09-22 07:02:10 +02:00
Aevann1 227810dec9 add /live icon 2022-09-22 06:34:16 +02:00
Aevann1 4415e869ec sneed 2022-09-22 04:00:02 +00:00
Aevann1 0be4167069 revert last commit 2022-09-22 04:47:28 +02:00
Aevann1 b85c1940ed [pcm] cosmetic change 2022-09-22 04:46:44 +02:00
Aevann1 553218aaa5 make /live a cached cron job 2022-09-22 04:33:45 +02:00
Aevann1 59f7a7655b remove ordering as a test 2022-09-22 04:29:50 +02:00
Aevann1 ddcebd10be cosmetic changes 2022-09-22 04:29:09 +02:00
Aevann1 1dfbad69b8 cosmetic changes 2022-09-22 04:27:41 +02:00
Aevann1 61f4ae8731 add a red circle to /live 2022-09-22 04:25:03 +02:00
Aevann1 71309f86fb order by viewer count 2022-09-22 04:22:21 +02:00
Aevann1 c20fc34704 dfs 2022-09-22 04:20:47 +02:00
Aevann1 d55438afad
Live (#364) 
* test on devrama

* fix prev commit

* fix prev commit

* try some shit

* try some shit

* try some shit

* fix

* make it easier to change notif colors with custom css

* de

* t

* fgddfg

* fds

* fix

* fds

* dfs

* pain

* sdfsdf

* df

* xcv

* fd

* vxc

* xcv

* c

* fgdfgd

* sdf

* fsd

* fds

* sfd

* fdsf

* fd

* fds

* fds

* fsd

* fds

* fds

* fds

* fds

* fsd

* fds

* df

* fds

* dfs

* fd

* fsd

* fsd

* dfs

* sdf

* fsd

* fsd

* df

* dfs

* fd

* fsd

* dfs

* sdf

* sdf

* sdf

* fsd

* fds

* sfd

* sdf

* fds

* dfs

* df

* sdf

* sdf

* /live
 2022-09-22 04:17:02 +02:00
scitzocel 610e1fbada
Sneed (#362) 
* MARSEYANTISCHIZO

Fixed betting that was fucked

* Update admin.py
 2022-09-22 02:22:08 +02:00
Aevann1 d22d60b5f7 fix typos 2022-09-22 01:52:39 +02:00
Aevann1 2b594d75bc Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-22 01:23:02 +02:00
Aevann1 88137c848e make it easier to change notif colors with custom css 2022-09-22 01:22:59 +02:00
Aevann1 dd75524566 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-21 23:22:33 +00:00
Aevann1 9cebcb4a1b sneed 2022-09-21 23:00:06 +00:00
Aevann1 eb12464d43 make award immunity only in rdrama 2022-09-22 00:30:12 +02:00
Aevann1 955cee3f83 revise award immunity 2022-09-22 00:28:58 +02:00
Aevann1 201208e673 make deflector not stack 2022-09-22 00:28:35 +02:00