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

19744 Commits (e96ebcde5ff61a680569b72f4c09cef9005f011e)

Author SHA1 Message Date
Aevann1 ea30e3f3e7 convert snakes leaderboard downvote code to ORM 2022-10-06 23:57:46 +02:00
Aevann1 3b441d8ca7 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-06 23:17:38 +02:00
Aevann1 8b1cf50965 fix misplaced ")" resulting in 500 error 2022-10-06 23:17:35 +02:00
Aevann1 598de07b95 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-06 21:16:23 +00:00
Aevann1 9bff6a682e fix margins for award_modal and emoji_modal and popover 2022-10-06 23:16:16 +02:00
Aevann1 34cb2e0ccb sneed 2022-10-06 20:00:06 +00:00
Aevann1 6bdb0d792b fix my mentions 2022-10-06 21:52:57 +02:00
Snakes 60e4e92e90
Suppress ffmpeg progress output, fix trailing flag. 2022-10-06 15:17:36 -04:00
Aevann1 3cf838af29 fix thumbnails and add opera-proxy to docker 2022-10-06 21:07:45 +02:00
Aevann1 73e1819199 remove commented lines in ubuntu_setup.sh 2022-10-06 20:48:15 +02:00
Snakes c7ef508c2f
PCM: update sidebar with livelist link. 2022-10-06 14:02:01 -04:00
Aevann1 a2b0d2f824 sneed 2022-10-06 12:00:08 +00:00
justcool393 523eb1c03d conflict resolution 2 2022-10-06 03:37:45 -07:00
justcool393 a30edea43d resolve conflict 2022-10-06 03:37:00 -07:00
justcool393 7fa874fd84 check current user's admin level not the victim's 2022-10-06 03:34:12 -07:00
justcool393 5e821add4a i don't know why this is different but fix an missing endif 2022-10-06 03:17:45 -07:00
justcool393 b7580e788b change whitespace just so i can read this darn page 2022-10-06 03:13:30 -07:00
justcool393 d4b3e4ac5b fix some stuff in the user page template including add mute to user page properly 2022-10-06 03:05:18 -07:00
justcool393 931cee2393 fix syntax error 2022-10-06 02:41:03 -07:00
justcool393 2b51b13dcc user moderation tools visible permission 2022-10-06 02:37:41 -07:00
justcool393 eeca9617bd post comment moderation tools visible permission 2022-10-06 02:33:46 -07:00
justcool393 30f3321218 mobile post admin actions 2022-10-06 02:20:38 -07:00
Snakes 24167b1d09
Fix thumbnail_thread passing uploader to media. 2022-10-06 05:15:21 -04:00
justcool393 8db6b3f7fd improve POST_TO_CHANGELOG check 2022-10-06 02:09:46 -07:00
justcool393 941bf69227 syntax error 2022-10-06 02:06:48 -07:00
Snakes 7eefcf5308
Stopgap optimize leaderboard received downvotes. 2022-10-06 04:57:21 -04:00
justcool393 d0534897ec ... 2022-10-06 01:40:33 -07:00
justcool393 e93e2d9ca9 convert some more >s to >=s 2022-10-06 01:40:21 -07:00
Aevann1 e071f9c81b remove leaderboard_thread 2022-10-06 10:23:29 +02:00
justcool393 397cf68abd view vote buttons on user page 2022-10-06 01:14:32 -07:00
Aevann1 fc1d56053d sneed 2022-10-06 08:14:32 +00:00
justcool393 8bed8c64e8 rearrange and rename a couple of permissions 2022-10-06 00:55:54 -07:00
justcool393 02d0e2043e rename APPS_MODERATE to APPS_MODERATION 2022-10-06 00:40:36 -07:00
justcool393 6e33531be3 remove a _FOR_ 2022-10-06 00:38:33 -07:00
justcool393 ad7f3b7363 > to >= 2022-10-06 00:34:57 -07:00
Aevann1 79960d58be ping me for "aev" 2022-10-06 09:33:47 +02:00
justcool393 767093d060 add perms for things we don't really know what they are 2022-10-06 00:32:05 -07:00
Aevann1 96f4f8499f fix 500 errors 2022-10-06 09:30:38 +02:00
justcool393 f5be49c336 some template end stuff 
i feel like this one is ehhhh and might have to be fixed at some point
i'm not sure where some of these things are used, the templates really need to be refactored
 2022-10-06 00:17:12 -07:00
justcool393 f1275b90eb filter properly per poll: https://rdrama.net/post/79285/-/2845495 2022-10-06 00:04:46 -07:00
justcool393 b58b506014 lottery admin templateend 2022-10-05 23:59:52 -07:00
justcool393 9b8a3f21ab templateend hats, marseys, apps, notifications, etc 2022-10-05 23:56:37 -07:00
justcool393 d04e5a188c streamer moderation templateend 2022-10-05 23:46:37 -07:00
justcool393 6c3b0f13da search and stuff 2022-10-05 23:45:27 -07:00
Aevann1 fea0ce115f do the result of this poll https://rdrama.org/post/79285/-/2845495?context=8#context 2022-10-06 08:41:48 +02:00
Aevann1 c22c77ade6 same as last commit 2022-10-06 08:37:32 +02:00
Aevann1 d73990d5b2 delete granted_by column 2022-10-06 08:35:42 +02:00
justcool393 45f40f32b7 admin user page fix 2022-10-05 23:33:39 -07:00
justcool393 98397e7d3f admin home and user last active viewing 2022-10-05 23:27:34 -07:00
Aevann1 baa447ba19 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-06 08:26:13 +02:00