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

11475 Commits (4274d1633f8f7a9db5ad86477330824d802e0d46)

Author SHA1 Message Date
Aevann 4274d1633f split macros.file_input into 3 in preparation for next commit 2023-10-05 13:57:32 +03:00
Aevann 0867c47d9c rename customtitle to flair 2023-10-05 13:39:12 +03:00
Aevann 3dc652f867 "Hide Signatures" -> "User Signatures" 2023-10-05 13:33:01 +03:00
Aevann a1de1cf7c8 "Disable NSFW Warnings" -> "NSFW Warnings" 2023-10-05 13:29:23 +03:00
Aevann bb7192c929 rename over_18 to nsfw 2023-10-05 13:19:50 +03:00
Aevann aeb9e669d4 rename over18 and over-18 to nsfw 2023-10-05 13:15:05 +03:00
Aevann 019621490a refactor can_see and use it more 2023-10-05 13:09:58 +03:00
Aevann d952bf49db Revert "refactor can_see and use it more" 
This reverts commit a0cf583460.
 2023-10-05 12:55:35 +03:00
Aevann 74587b12da use can_see_shadowbanned 2023-10-05 12:44:42 +03:00
Aevann 2f9a5a30bf show note for emoji award too 2023-10-05 12:39:58 +03:00
Aevann c07c97b9ec make notes look better 2023-10-05 12:39:08 +03:00
Aevann 0504f78373 add the showing note thing to comments too 2023-10-05 12:34:09 +03:00
Aevann 03ffc932ee fix nsfw warning wording and margin 2023-10-05 12:32:23 +03:00
Aevann a0cf583460 refactor can_see and use it more 2023-10-05 12:22:05 +03:00
Aevann ff155f0499 put the cost in the house change warning 2023-10-04 19:58:10 +03:00
Aevann 82e9d1fc0c display new name, new flair, and chud phrase in tooltips of "namelock" "flairlock" and "chud" awards respectively 2023-10-04 19:49:52 +03:00
Aevann 890976b60b "Yes, I'm NSFW" -> "Yes" 2023-10-04 18:48:37 +03:00
Aevann 5c1a2ac7a1 18+ -> NSFW 2023-10-04 17:04:06 +03:00
Aevann c454887445 allow 18+ emojis to be used with "emoji" award but only show their effect to ppl with "Disable 18+ warnings" on 2023-10-04 16:36:26 +03:00
Aevann 7fced29fba change wholesome award to emoji award 2023-10-04 16:05:43 +03:00
Aevann b24be481d7 new_name->new_flair, title->flair 2023-10-04 15:29:41 +03:00
Aevann a44ffb8f4a when making a hole, redirect to it 2023-10-04 15:20:55 +03:00
Aevann 0a70515b3e rename property 2023-10-03 09:19:46 +03:00
Aevann 2e3fb6d521 fix inline emoji search inside "report post" modal in post_listing.html 2023-10-02 18:00:40 +03:00
Aevann cb4b05047e remove now-unnecessary class 2023-10-02 17:55:39 +03:00
Aevann c061936b53 make award immunity only apply to negative awards 2023-10-02 17:24:09 +03:00
Aevann df0f67666c Revert "remove monero donation option" 
This reverts commit 52d0a3dc7d.
 2023-10-02 11:26:26 +03:00
Aevann f4a790edd8 fix this https://rdrama.net/post/208130/updated-episode-of-the-podcast-where/5083191#context 2023-10-02 11:12:54 +03:00
Aevann f18efb26f6 dedup award classes 2023-10-02 11:05:30 +03:00
Aevann cfac407dcd Revert "merge chat.html and orgy.html" 
This reverts commit 094cbf1c41.
 2023-10-02 09:12:31 +03:00
Aevann f4104aa875 dedup perma-slur and perma-profanities 2023-10-02 09:10:24 +03:00
Aevann 5c80f0017f no more href="#" 2023-10-02 09:06:29 +03:00
Aevann 5df365f546 change id 2023-10-02 09:04:38 +03:00
Aevann 776d9fc091 revert the modal change 2023-10-02 09:04:05 +03:00
Aevann ee8a0c5898 move an icon from the sidebar to the directory 2023-10-02 07:50:41 +03:00
Aevann a9c5e5f2e8 change advanced settings icon 2023-10-02 07:47:03 +03:00
Aevann 094cbf1c41 merge chat.html and orgy.html 2023-10-02 07:04:41 +03:00
Aevann a161765aaa allow carp to send ppl a comment when approving hats or emojis 2023-10-02 06:40:30 +03:00
Aevann b99d4ae05d fix emoji button in chat 2023-10-02 06:18:09 +03:00
Aevann f0747484b5 apparently i dont need modal-content in expandedImage anymore lol 2023-10-02 06:13:29 +03:00
Aevann 19b8e18db2 desktop-expanded-image > expanded-image 2023-10-02 06:12:06 +03:00
Aevann 969fc7d728 fix 500 error 2023-10-02 05:56:57 +03:00
Aevann 177a460ba9 remove unnecessary garbage 2023-10-02 05:47:05 +03:00
Aevann 3fb9e23149 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/5089269#context 2023-10-02 05:23:28 +03:00
Aevann 46899f2542 fix hamburger menu 2023-10-01 16:09:42 +03:00
Aevann a9f9bd9bb1 fixes to modal commit 2023-10-01 15:57:41 +03:00
Aevann 0c9689df54 fixes to modal change 2023-10-01 15:35:40 +03:00
Aevann 92a5174466 use my own modal system instead of bootstrap in preparation for potentially not using bootstrap.js anymore (also I like it more and wanna see if anybody notices any changes at all) 2023-10-01 15:03:52 +03:00
Aevann 992f1e6df4 rename 2 css files 2023-10-01 11:15:50 +03:00
SneedBot 8b49ba4453 sneed 2023-10-01 07:32:16 +00:00