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

613 Commits (6a6b4c46b8570b5a35c55f9c5310493ece7a8ad2)

Author SHA1 Message Date
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
Aevann1 4d15d76dfa show the earlylife parantheses in more places 2022-10-07 01:31:09 +02:00
justcool393 98397e7d3f admin home and user last active viewing 2022-10-05 23:27:34 -07:00
Snakes 7f81f62bb3
Amend ebf83687948: that was r-slurred. 2022-10-05 23:17:09 -04:00
Snakes ebf8368794
WPD: fix mobile header logo sizing. 2022-10-05 23:11:59 -04:00
Snakes a3664e252c
assetcache: change asset_siteimg macro to filter. 2022-09-24 03:14:20 -04:00
Aevann1 227810dec9 add /live icon 2022-09-22 06:34:16 +02:00
Aevann1 88137c848e make it easier to change notif colors with custom css 2022-09-22 01:22:59 +02:00
Aevann1 97dc727e22 cachebust 2022-09-20 23:22:58 +02:00
Aevann1 696423d174 add /donate page 2022-09-20 01:59:24 +02:00
Aevann1 bb28d2d2a3 delete /order 2022-09-19 19:13:24 +02:00
Aevann1 67d1b05d14 fix header image 2022-09-17 16:45:46 +02:00
Aevann1 65d396a499 kofi 2022-09-14 10:28:01 +02:00
outruncolors 3ebccf35d1
Add order page (#353) 
* Add order page route

* Initial backend post route

* Move to static and prevent logged in users

* Update files/routes/static.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Make requested changes

* Last snake changes

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-13 21:21:25 -05:00
Aevann1 df2de5f087 rearrange 2022-09-13 21:44:06 +02:00
Aevann1 39dfd05a27 move "donate" up 2022-09-13 12:31:26 +02:00
Aevann1 2e31b52366 for consistency's sake, don't use {sub.name} inside strings anymore 2022-09-12 07:25:04 +02:00
Aevann1 41dac65e9c fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2702071?context=8#context 2022-09-12 07:05:11 +02:00
Aevann1 bd7c0e71bf forgot to cachebust 2022-09-10 11:34:48 +02:00
Aevann1 770e818d67 add telegram links 2022-09-10 05:52:56 +02:00
Aevann1 4791e7b14b revert icon change 2022-09-08 19:24:00 +02:00
Aevann1 f4e4ff3839 comsetic shit 2022-09-08 17:38:27 +02:00
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +02:00
Aevann1 1242a2d009 change casino icon and more cachebusting 2022-09-05 02:10:44 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
outruncolors 5e1d98a3bf
WIP: Add Casino (Do Not Merge) (#341) 
* Add new /casino route and template

* Consolidate lottery into casino and add initial template for slots

* Change /lottery route to /casino and replace icon with usd symbol and change sitewide const to reflect change

* Hook up new slots method to casino

* Enable Marseybux spending in casino slots

* Add UI for playing blackjack in casino

* First connection of blackjack UI to backend

* Add protective clause thanks to help from carpathianflorist.

* Create new Casino_Game relation and persist inside of blackjack

* Connect new slots behavior to Casino_Game table

* Create UI action management logic

* Add blackjack game status checker which adds persistence for blackjack

* Gonna handle this better, hold on

* Reorganize blackjack helper methods

* Reorganize casino.js to account for new changes

* Connect up to frontend

* Little changes ya know

* Display a message when winning in Blackjack

* Fix some issues with double down and insure

* Revert "remove owoify-py from requirements"

This reverts commit 4454648ea2.

* A little casino styling change

* Reorganize into a casino block

* Smallenize the card'

* Remove references to old game data on comments

* Add sql migration file

* Remove logic to drop old columns

* Fix two forgotten conflicts
 2022-09-04 22:53:34 +02:00
Aevann1 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +02:00
Aevann1 d9a9d6bd0e /hats never reloads now, don't read code if u value ur sanity 2022-09-03 22:45:06 +02:00
Aevann1 393fbf075d decrease padding-top by 0.1px 2022-09-03 21:52:46 +02:00
Aevann1 5feb479cd2 apply slur filter to hat descriptions 2022-09-03 20:55:03 +02:00
Aevann1 0839077838 fix pup mask 2022-09-03 04:48:27 +02:00
Aevann1 8f5e4c3ec6 add .hat class for easier blocking 2022-09-03 03:52:54 +02:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 567c772b11 add sidebar button for tabletcels 2022-09-02 19:54:01 +02:00
Aevann1 9bc075193f increase margin after "users in chat" 2022-08-30 13:45:59 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 ac98f54902 remove .can_gamble 2022-08-26 23:00:17 +02:00
Aevann1 11d7f34ad0 allow hole jannies to change the hole marsey + cachebust all site assets 2022-08-25 00:22:44 +02:00
Aevann1 771b143372 restore feather icon 2022-08-24 23:58:39 +02:00
Aevann1 d34fab95b7 add "create post" button to mobile 2022-08-24 23:11:54 +02:00
Aevann1 521dd8886c add "users in chat right now" to hamburger menu 2022-08-23 20:36:02 +02:00
Aevann1 b7b7036b08 trying to fix an annoying bug 2022-08-20 14:28:14 +02:00
Aevann1 a39c4b6b72 change chat default back to 0 2022-08-19 15:04:52 +02:00
Aevann1 d4435a2a27 lazy loading for hats 2022-08-18 22:29:00 +02:00
Aevann1 2d2bbd63f9 allow ppl to middle-mouse-click on their profile on the header to open it 2022-08-18 22:18:23 +02:00
Aevann1 05ad24b500 fix 2022-08-18 16:12:09 +02:00
Aevann1 101abb55eb normalize "people here now" 2022-08-18 16:11:26 +02:00
Aevann1 395769d70d remove marseylowpoly from header (235KB) 2022-08-18 12:53:48 +02:00
Aevann1 1d7b19f485 make "before" and "after" human-readable 2022-08-17 21:09:15 +02:00
Aevann1 f52c20202f change chat default to 1 2022-08-16 18:19:44 +02:00
Aevann1 39da83e913 pretty prev commit up 2022-08-14 05:52:36 +02:00
Aevann1 a817fc35c0 show online on chat in dropdown menu 2022-08-14 05:51:25 +02:00
Aevann1 ad9cdceab4 pretty up chat count 2022-08-14 05:46:00 +02:00
Aevann1 10b23be5d2 add an id to the chat count 2022-08-14 02:26:48 +02:00
Aevann1 edc44c62b4 fix forgotten " 2022-08-13 11:59:33 +02:00
Aevann1 aea7e91b60 cosmetic changes to chat 2022-08-13 11:58:57 +02:00
Aevann1 6fe4a39908 finish the chat count commit 2022-08-13 09:45:57 +02:00
Aevann1 a51a2d2a1b remove unnecessary ending backslash from href values 2022-08-13 09:42:19 +02:00
Aevann1 9557553508 add chat users-online counter to chat icon on desktop header 2022-08-13 09:42:06 +02:00
Aevann1 d4f996a5a6 shorten too long flavor phrases for visitors 2022-08-13 04:45:31 +02:00
Aevann1 ea2f66145a add id to hole name in header 2022-08-11 18:47:43 +02:00
Aevann1 26959e0751 murder deuxrama.net 2022-08-11 18:46:11 +02:00
Snakes 249c593379 Hats: frontend interface, migrate cakeday. 
Getting the basic hats frontend changes into master so my branch stops
diverging from the templates. Migrates the existing cakeday partyhat
functionality to the new system also.

Establishes a (hopefully) static interface for PFP hat display:
  - Hat image assets are 100px w x 130px h and anchored to the bottom-
    left corner of pfps.
  - User.hat_active provides either empty string or the internal
    string identifier for active user hat.
  - User.hat_tooltip provides mouseover text. Likely only to be used
    for cakeday hats on one's cakeday.

Additionally, per discussion with Carp, PFPs in comments and posts
increased from 25px diameter to 30px.
 2022-08-11 03:30:43 -04:00
Aevann1 45fb2de7e5 delete too long visitor flavor text 2022-08-11 06:30:36 +02:00
Snakes 4fddb88c1a Hide Android app menu on sites without app. 2022-08-07 02:57:30 -04:00
Aevann1 f1232b9d04 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-06 21:15:18 +02:00
Aevann1 928351fec3 increase chance of visitors displaying 2022-08-06 21:15:16 +02:00
Snakes 997cb2df89
rDrama: restore non-Juggalo site styling. 2022-08-06 11:45:53 -04:00
Aevann1 c1d99ecef3 restore the black classes in header 2022-08-06 01:12:22 +02:00
Aevann1 5f40941c55 I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme I hate classic theme 2022-08-06 01:08:06 +02:00
Aevann1 9a2b80e374 spam carp inbox 2022-08-04 23:20:29 +02:00
Snakes 43b4acd3a8
Fix b75d504d91a5: icon swap conditional on site. 2022-08-01 17:24:06 -04:00
Snakes b75d504d91
rDrama: swap header icon for Carp's juggalo event. 2022-07-31 23:50:19 -04:00
Aevann1 87aed97339 remove a space 2022-07-28 20:29:47 +02:00
Aevann1 763b0dd959 decrease body padding-top 2022-07-28 20:29:35 +02:00
Aevann1 9beb3e3a4f fix <body> padding 2022-07-27 22:05:22 +02:00
Aevann1 008f12a1f3 increase chance of user counter on rdrama 2022-07-23 10:12:29 +02:00
Snakes 3225a2a3d4
LGB: disable awards, badges. 2022-07-19 19:59:39 -04:00
Snakes 9d036441e7
LGB: Hide donation in all contexts. 
Additionally, refactors some instances of `SITE_NAME != 'WPD'` to use
`FEATURES['PROCOINS']` as appropriate.
 2022-07-18 03:32:26 -04:00
Snakes 0c43deeee6
FEATURES: pronouns, kys, chat, house, /vote perm. 2022-07-18 02:43:20 -04:00
Snakes 8f7d05d62d
Refactor feature flags to dict. 
In anticipation of adding about a dozen more features flags to support
work for LGB, PIN_ENABLED and PROCOINS_ENABLED have been moved to the
FEATURES dict in const.py. More generally looking to create a unified
interface for logically-related constants, perhaps to support e.g.
later moving these settings from hardcoded constants to data.
 2022-07-18 01:10:01 -04:00
Aevann1 8af9b8a339 wipe cringetopia 2022-07-18 04:46:03 +02:00
Aevann1 255e8b88d2 make user counter better 2022-07-18 00:56:34 +02:00
Aevann1 86717e37b2 refactor changelog 2022-07-13 23:03:11 +02:00
Aevann1 cd94fa535f restore user count for PCM 2022-07-13 20:17:03 +02:00
Aevann1 df3df30840 fix 500 errors 2022-07-13 15:11:37 +02:00
Aevann1 2da7bea62b combine the 2 user counters for non-jannies 2022-07-13 15:08:21 +02:00
Aevann1 05fb4168e4 hide user counter on other sites when num of users is under 100 2022-07-13 10:19:21 +02:00
Aevann1 240ffdb675 Revert "move the icons to the headers on desktop" 
This reverts commit 292207bd83.
 2022-07-12 21:18:40 +02:00
Aevann1 b7b0b200ad move icons back to sidebar for PCM 2022-07-12 02:40:30 +02:00
Aevann1 292207bd83 move the icons to the headers on desktop 2022-07-11 18:53:33 +02:00
Snakes 85d59d5656 LGB: Populate sidebar. 2022-07-09 08:51:08 -04:00
Aevann1 4093eba7d0 fix notifications link on mobile 2022-07-09 09:23:25 +02:00
Aevann1 ad1273995d notifications rework 2022-07-08 20:06:54 +02:00
Snakes 5407f4ed7f Lottershe icon back to navbar. 2022-07-03 14:33:31 -04:00
Snakes 1b9237ceaf Add assetcache.asset_siteimg, has_logo. 
Commit began by changing the duplicated SITE_NAME conditional in the
header to use a `has_logo` param, much like the recent `has_sidebar`.
From there, a need to include site-specific assets in assetcache was
revealed, adding the `asset_siteimg(...)` macro. This was applied
quite broadly, though not comprehensively.
 2022-07-01 01:55:53 -04:00
Snakes 39c945f7ca LGB: Initial sidebar & const. 2022-07-01 01:08:15 -04:00