Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize Buttons #15330

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from

Commits on Sep 26, 2024

  1. first pass

    CuriousMagpie committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0745c71 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. second pass

    CuriousMagpie committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    f0865dc View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Configuration menu
    Copy the full SHA
    be440a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Configuration menu
    Copy the full SHA
    1e1afe4 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Configuration menu
    Copy the full SHA
    d58d1c0 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. updates per comments

    CuriousMagpie committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    e425b35 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5e5377a View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Configuration menu
    Copy the full SHA
    52238af View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Hourglass Simplification (HabitRPG#15323)

    * begin removing obsolete tests
    
    * begin refactoring
    
    * update cron tests
    
    * cleanup
    
    * finish basic implementation of new logic
    
    * add more subscription tests
    
    * subscription test improvements
    
    * return nextHourglassDate again
    
    * fix gem limit
    
    * fix(test): short circuit this.
    
    * fix(admin): correct logic and style for shrimple subs
    
    * WIP(frontend): draft of main subs page view
    
    * fix hourglass count
    
    * Fix hourglass logic for upgrades
    
    * fix admin panel display
    
    * WIP(subs): extant Stripe state
    
    * fix admin panel strings
    
    * fix missing transaction type
    
    * add new field for cumulative subscription count
    
    * show date for hourglass bonus if it was received
    
    * fix test
    
    * feat(subscription): max Gems progress readout
    
    * fix(css): correct and refactor heights and selection states
    
    * fix(subs): correct border-radius and redirect
    
    * fix(stripe): correct redirect after success
    
    * Admin panel display fixes
    
    * don’t give additional HG for new sub if they already got one this month
    
    * fix issue with promo hourglasses
    
    * fix(subscription): update layout when gifting
    
    * fix(subscriptions): more gift layout revisions
    
    * fix(subscriptions): minor visual updates
    
    * fix(subs): pass autoRenews through Stripe
    
    * fix(subs): gifts DON't renew
    
    * fix(lint): unnecessary ternary
    
    * fix(lint): do negate object ig
    
    * fix(subs): try again on gifts
    
    * fix(subs): unhovery and un-12-monthy
    
    * fix bug with incorrectly giving HG bonus
    
    * remove only
    
    * fix test
    
    * fix test
    
    * fix(subs): also redirect to subs after gift sub
    
    * fix(subs): fix typeError
    
    * fix(g1g1): don't try to find Gems promo during bogo
    
    ---------
    
    Co-authored-by: Phillip Thelen <[email protected]>
    Co-authored-by: Kalista Payne <[email protected]>
    3 people authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    1b44d9a View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. merge develop

    CuriousMagpie committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    015417b View commit details
    Browse the repository at this point in the history
  2. Hourglass Simplification (HabitRPG#15323)

    * begin removing obsolete tests
    
    * begin refactoring
    
    * update cron tests
    
    * cleanup
    
    * finish basic implementation of new logic
    
    * add more subscription tests
    
    * subscription test improvements
    
    * return nextHourglassDate again
    
    * fix gem limit
    
    * fix(test): short circuit this.
    
    * fix(admin): correct logic and style for shrimple subs
    
    * WIP(frontend): draft of main subs page view
    
    * fix hourglass count
    
    * Fix hourglass logic for upgrades
    
    * fix admin panel display
    
    * WIP(subs): extant Stripe state
    
    * fix admin panel strings
    
    * fix missing transaction type
    
    * add new field for cumulative subscription count
    
    * show date for hourglass bonus if it was received
    
    * fix test
    
    * feat(subscription): max Gems progress readout
    
    * fix(css): correct and refactor heights and selection states
    
    * fix(subs): correct border-radius and redirect
    
    * fix(stripe): correct redirect after success
    
    * Admin panel display fixes
    
    * don’t give additional HG for new sub if they already got one this month
    
    * fix issue with promo hourglasses
    
    * fix(subscription): update layout when gifting
    
    * fix(subscriptions): more gift layout revisions
    
    * fix(subscriptions): minor visual updates
    
    * fix(subs): pass autoRenews through Stripe
    
    * fix(subs): gifts DON't renew
    
    * fix(lint): unnecessary ternary
    
    * fix(lint): do negate object ig
    
    * fix(subs): try again on gifts
    
    * fix(subs): unhovery and un-12-monthy
    
    * fix bug with incorrectly giving HG bonus
    
    * remove only
    
    * fix test
    
    * fix test
    
    * fix(subs): also redirect to subs after gift sub
    
    * fix(subs): fix typeError
    
    * fix(g1g1): don't try to find Gems promo during bogo
    
    ---------
    
    Co-authored-by: Phillip Thelen <[email protected]>
    Co-authored-by: Kalista Payne <[email protected]>
    3 people committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    522ee9c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c366459 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5a42140 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0a91176 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    76e0328 View commit details
    Browse the repository at this point in the history