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

18651 Commits (b23dc76d78f5adca490d55327ba21f40299cdc81)

Author SHA1 Message Date
Aevann b23dc76d78 fix muting linking alts 2023-01-25 04:53:52 +02:00
Aevann 9866e7ed95 Merge branch 'master' of https://fsdfsd.net/rDrama/rDrama 2023-01-25 04:51:51 +02:00
Aevann 680135755e Revert "get rid of get_alt_graph" 
This reverts commit e2e3da4bda.
 2023-01-25 04:51:48 +02:00
mummified-corroding-granny e7a786b7e9 remove z-index from dropdowns in search page (#96) 
Kindly,

This fixes issue I created rDrama/rDrama#60 . Note that both z-indexes had to be removed because when I kept either of them, there was still z-fighting issues.

Considering that .dropdown-actions is used elsewhere, I tested the changes also on these pages and it still (TM) works on my machine (TM).

./files/templates/home_comments.html <----- Didn't test on /comments because disabled but it is same as search.html AFAIK
./files/templates/home.html
./files/templates/log.html
./files/templates/search.html
./files/templates/submission.html
./files/templates/userpage/header.html

Reviewed-on: rDrama/rDrama#96
Co-authored-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
Co-committed-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
 2023-01-25 02:25:16 +00:00
geese_suck e891d25777 fix award placement lol (#95) 
this is fine :marseyclueless:

Reviewed-on: rDrama/rDrama#95
Co-authored-by: geese_suck <deandre.williams@geese-suck.us>
Co-committed-by: geese_suck <deandre.williams@geese-suck.us>
 2023-01-25 02:25:01 +00:00
Aevann 585d8f9695 fix make admin button 2023-01-25 03:53:20 +02:00
Aevann 9327ef6eed chat fixes 2023-01-25 03:17:39 +02:00
Aevann 72fabb1dff Revert "Revert "handle race condition for signup notifs"" 
This reverts commit 44a8c2338e.
 2023-01-25 03:09:32 +02:00
Aevann 947be4fef6 fix missing perm 2023-01-25 03:07:49 +02:00
Aevann 8641e62543 Merge branch 'master' of https://fsdfsd.net/rDrama/rDrama 2023-01-25 03:07:32 +02:00
Aevann e2e3da4bda get rid of get_alt_graph 2023-01-25 03:07:30 +02:00
SneedBot c3f3e8f5bc sneed 2023-01-24 16:00:11 +00:00
Aevann 7e8329c296 remove account merging stuff 2023-01-24 14:20:30 +02:00
Aevann b1b7393f11 disable more slow enddpoints 2023-01-24 13:25:04 +02:00
Aevann 3217a1146a fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3464917#context 2023-01-24 12:47:31 +02:00
Aevann e68a1540c5 fix js error 2023-01-24 12:40:25 +02:00
Aevann eb88240098 make sure toasts are always on top 2023-01-24 12:40:10 +02:00
Aevann 95674fa39a fix /admin/alts 2023-01-24 12:32:06 +02:00
Aevann 757c244f65 allow JL4 to unpin award pins 2023-01-24 12:24:27 +02:00
Aevann c1268d396b make it not possible to sticky removed comments 2023-01-24 12:23:19 +02:00
Aevann 7eec8af383 add the upload image button for mesages in profiles to mobile 2023-01-24 12:19:20 +02:00
Aevann d7004abaac fix users online in chat 2023-01-24 12:13:05 +02:00
Aevann 1d894192e0 delete duplicate boosted site 2023-01-24 12:10:17 +02:00
Aevann 1eb0cdffac add progstack to WPD too (fixed) 2023-01-24 12:05:16 +02:00
Aevann 0a42bde52b Revert "add progstack to WPD too" 
This reverts commit 966d6d2161.
 2023-01-24 12:02:33 +02:00
Aevann 7e47c0b9cc fix /log_out 2023-01-24 12:02:08 +02:00
Aevann 966d6d2161 add progstack to WPD too 2023-01-24 08:50:09 +02:00
SneedBot 625778721e sneed 2023-01-24 06:42:36 +00:00
Aevann dd5942a2f2 Merge branch 'master' of https://fsdfsd.net/rDrama/rDrama 2023-01-24 08:42:30 +02:00
SneedBot 18c74d8176 sneed 2023-01-24 06:41:05 +00:00
Aevann 9ca284c38a make 403 look like 404 in WPD 2023-01-24 08:40:45 +02:00
Aevann fd3f397214 add .tech tld 2023-01-24 08:30:49 +02:00
Aevann fa58ad978b fix syntax error in a previous commit 2023-01-24 08:02:35 +02:00
Aevann f1bdfa8eda disable modaction for login_required 2023-01-24 07:48:27 +02:00
Aevann 2c2167d51f limit all non-death holes in WPD 2023-01-24 07:43:46 +02:00
Aevann c1b1ccedff chat improvements 2023-01-24 07:28:56 +02:00
Aevann 0f4de38141 exclude merari and permabanned/shadowbanned from chudrama 2023-01-24 07:20:15 +02:00
Aevann 78738589b5 exclude merari from all restricted shit 2023-01-24 07:17:58 +02:00
Aevann 5502715122 replace type="hidden" with hidden 2023-01-24 07:10:16 +02:00
Aevann ec165579fe Merge branch 'master' of https://fsdfsd.net/rDrama/rDrama 2023-01-24 06:53:13 +02:00
Aevann 223909a2f8 fix 500 error on muting 2023-01-24 06:53:07 +02:00
SneedBot 6497f31060 sneed 2023-01-24 04:00:12 +00:00
mummified-corroding-granny cf1229d59a Stop skipping render of Follow/Unfollow button in user listing because profile is private (#94) 
As per title "Stop skipping render of Follow/Unfollow button in user listing because profile is private"

Happens when browsing through the user listing (at least):
* /search/users
* /users

Seems strange to hide that button in the user listing and not the profile page itself. When profiles are private, there can be some interest in following/unfollowing even without clicking the profile. Tried to search git history but no additional sense was obtained

Co-authored-by: Your Name <madmarcolas@gmail.com>
Reviewed-on: rDrama/rDrama#94
Co-authored-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
Co-committed-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
 2023-01-24 03:56:31 +00:00
official-techsupport 123cee6372 fix an edge case in showmore (when many long paragraphs) (#93) 
$subj

Co-authored-by: official-techsupport <official_techsupport@protonmail.com>
Reviewed-on: rDrama/rDrama#93
Co-authored-by: official-techsupport <official-techsupport@noreply.fsdfsd.net>
Co-committed-by: official-techsupport <official-techsupport@noreply.fsdfsd.net>
 2023-01-24 03:56:14 +00:00
chiobu c02c8312fa Upload Marsey Font for h/marsey (#92) 
Linking the font off-site doesn't work anymore as it violates the following Content Security Policy directive: "font-src 'self'"

Reviewed-on: rDrama/rDrama#92
Co-authored-by: chiobu <chiobu@noreply.fsdfsd.net>
Co-committed-by: chiobu <chiobu@noreply.fsdfsd.net>
 2023-01-24 03:55:52 +00:00
Aevann d1ee3ba0a3 fix 500 error 2023-01-23 14:44:30 +02:00
Aevann bdaced6c10 allow admins to apply progstack 2023-01-23 14:40:44 +02:00
Aevann 47dc6da582 allow pasting images in initial modmail and DMs 2023-01-23 14:00:04 +02:00
Aevann dd8e3255a0 allow pasting images in DM replies 2023-01-23 13:04:07 +02:00
Aevann 9ad4cf8035 add exclamation mark 2023-01-23 12:30:34 +02:00