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

19872 Commits (e5af46c4ae355b74f0f5a0c3607f88a9380fb8c4)

Author SHA1 Message Date
justcool393 1e585c07fa
p author id 2022-10-06 21:36:31 -07:00
Aevann1 b608a514e4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-07 05:25:37 +02:00
Aevann1 2d2a35d7ca make giving awards not refresh the page 2022-10-07 05:25:34 +02:00
justcool393 c5fa8a9e0c sb fix 2022-10-06 20:20:51 -07:00
justcool393 2d66363fed fix mobile template 2022-10-06 20:19:39 -07:00
justcool393 d9cc95dd71 fix global hole mod and template error 2022-10-06 20:06:22 -07:00
Aevann1 182784f097 sneed 2022-10-07 02:57:38 +00:00
justcool393 460894346d
Merge pull request #390 from justcool393/permissions-refactor 
[DO NOT MERGE] complete permissions refactor
 2022-10-06 19:56:05 -07:00
justcool393 c4c3d6cf49
Merge branch 'frost' into permissions-refactor 2022-10-06 19:55:36 -07:00
Aevann1 a2600767d1 notify ppl when admins add them into CC or disallow them from it 2022-10-07 04:51:56 +02:00
Aevann1 3ecb1b4f9a generate a mod log for CCing or unCCing posts and notify OP 2022-10-07 04:48:31 +02:00
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
justcool393 dd7e0abd6a fix some conflicts 2022-10-06 19:04:27 -07:00
justcool393 35162a4899 submission: change ADMIN_HOME_VISIBLE permissions to can view post mod tools perm 
user: make so user can't moderate themselves at least in the UI
 2022-10-06 18:44:33 -07:00
Aevann1 e0b1d7968a fix prev commit 2022-10-07 03:35:21 +02:00
Aevann1 01071a20e8 add banner_thread to PCM 2022-10-07 03:32:08 +02:00
justcool393 9b705fc23e check proper permissions 2022-10-06 18:31:40 -07:00
Aevann1 9024138934 sneed 2022-10-07 00:00:08 +00:00
Aevann1 d1f52447b1 remove old earlylife css code 2022-10-07 01:45:23 +02:00
Aevann1 c89df37af8 make emoji-modal and award-modal 90% width on desktop insttead of 80% 2022-10-07 01:41:18 +02:00
Aevann1 4d15d76dfa show the earlylife parantheses in more places 2022-10-07 01:31:09 +02:00
Aevann1 9d6dcca07a remove duplicate function 2022-10-07 00:59:50 +02:00
Aevann1 4ed67a6bef same ast last commit 2022-10-07 00:50:36 +02:00
Aevann1 c20b0c795b put the "??? ago" streamers last 2022-10-07 00:49:43 +02:00
Aevann1 3ffac6f0f6 fix tranny slur replacement in plainbody and plaintitle 2022-10-07 00:34:25 +02:00
Aevann1 dc93b5b7d2 get rid of the downvote table 2022-10-07 00:21:24 +02:00
Aevann1 0848008c8d fix prev leaderboard commit 2022-10-07 00:10:10 +02:00
Aevann1 ec58f10733 make capitalization consistent in leaderboard template 2022-10-06 23:59:49 +02:00
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