Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,535 Commits 64 Branches 1,256 Tags
eb2fc40d241b18d4ffff04c35e744f05e6e9ff52
Commit Graph

4244 Commits

Author SHA1 Message Date
Kalista Payne eb2fc40d24 fix(g1g1): don't try to find Gems promo during bogo 2024-10-24 15:41:43 -05:00
Kalista Payne d3eea86bd7 fix(subs): fix typeError 2024-10-24 15:00:09 -05:00
Kalista Payne e3ae9a2d67 fix(subs): also redirect to subs after gift sub 2024-10-24 13:57:27 -05:00
Kalista Payne acd6183e95 fix(subs): unhovery and un-12-monthy 2024-10-21 17:22:26 -05:00
Kalista Payne 935e9fd6ec fix(subs): try again on gifts 2024-10-18 14:50:17 -05:00
Kalista Payne 6819e7b7e5 fix(subscriptions): minor visual updates 2024-10-17 16:03:25 -05:00
Kalista Payne 74633b5e5e fix(subscriptions): more gift layout revisions 2024-10-16 17:27:41 -05:00
Kalista Payne a90ccb89de fix(subscription): update layout when gifting 2024-10-16 15:37:50 -05:00
Phillip Thelen f14cb09026 Admin panel display fixes 2024-10-14 10:38:01 +02:00
Kalista Payne f4cff698cf fix(stripe): correct redirect after success 2024-10-03 17:58:59 -05:00
Kalista Payne c468b58f3f fix(subs): correct border-radius and redirect 2024-10-03 17:35:37 -05:00
Kalista Payne 78fb9e31d6 fix(css): correct and refactor heights and selection states 2024-10-03 16:59:00 -05:00
Kalista Payne e2babe8053 feat(subscription): max Gems progress readout 2024-10-03 16:59:00 -05:00
Phillip Thelen ef8ff0ea9e show date for hourglass bonus if it was received 2024-10-03 16:59:00 -05:00
Phillip Thelen 4bafafdc8d add new field for cumulative subscription count 2024-10-03 16:59:00 -05:00
Kalista Payne f3398db65f WIP(subs): extant Stripe state 2024-10-03 16:59:00 -05:00
Phillip Thelen c6b2020109 fix admin panel display 2024-10-03 16:59:00 -05:00
Kalista Payne cd752fbdce WIP(frontend): draft of main subs page view 2024-10-03 16:58:59 -05:00
Kalista Payne 0102b29d59 fix(admin): correct logic and style for shrimple subs 2024-10-03 16:58:59 -05:00
Kalista Payne 5469a5c5c3 fix(test): short circuit this. 2024-10-03 16:58:59 -05:00
Phillip Thelen e036742048 cleanup 2024-10-03 16:58:59 -05:00
Natalie 8e54cef68b Remove smartbanner (#15329) 
* remove smartbanner

* remove smartbanner.js dependency
 2024-10-01 17:25:58 -05:00
Kalista Payne ffa89202e6 Squashed commit of the following: 
commit 22dc77c0290ac7dd0e4ad91264d07fa5833ac6ba
Author: Kalista Payne <sabe@habitica.com>
Date:   Tue Sep 17 20:34:00 2024 -0500

    fix(event): remove UTC wording

commit c72b5dbbee80c7da9839f57102ab45ff3e42b8f7
Author: Kalista Payne <sabe@habitica.com>
Date:   Tue Sep 17 20:23:49 2024 -0500

    fix(sale): use native JS for showing tz info
 2024-09-23 08:37:18 -05:00
Kalista Payne f9fb463128 October Prebuild (#15325) 
* Add october background

* Add armoire

* Add subscriber gear

* add new pet

* improve quest tests

* Fixes from gear switchup

* use new sprite system for quest images

* fixes

* fix quest image alignment

* add missing string

* fix(style): lint warnings and typo

---------

Co-authored-by: Phillip Thelen <phillip@habitica.com>
Co-authored-by: Sabe Jones <sabe@habitica.com>
 2024-09-17 16:13:51 -05:00
Sabe Jones 486b7d4da1 fix(footer): short circuit user for timetravel 2024-09-16 09:47:21 -05:00
Sabe Jones 91b47e56ff Squashed commit of the following: 
commit 04fbddfd9a
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 30 16:55:12 2024 -0500

    fix(groups): remove outdated group FAQ modal

commit a7ffdc9593
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 30 16:34:03 2024 -0500

    fix(groups): don't spawn Justin during Groups onboarding

commit c8205de6c7
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 30 16:03:03 2024 -0500

    fix(groups): correct static page account creation flow

commit 700718bd54
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 23 17:47:28 2024 -0500

    chore(payments): start retiring Amazon Payments

commit 0df75b771a
Author: Sabe Jones <sabe@habitica.com>
Date:   Tue Aug 20 10:34:28 2024 -0500

    fix(groups): don't use DO NOT USE modal

commit aed7ff5f47
Author: Sabe Jones <sabe@habitica.com>
Date:   Mon Aug 19 19:40:46 2024 -0500

    refactor(groups): rearrange some CSS for better semantics

commit fd743265cf
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 16 18:11:47 2024 -0500

    fix(groups): add missing upgrade workflow pieces

commit ae4469703d
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Aug 15 10:32:36 2024 -0500

    WIP(groups): style and HTML corrections
    Also workflows for static and non-upgrade logged-in scenarios

commit c6a468dabc
Author: Sabe Jones <sabe@habitica.com>
Date:   Tue Aug 13 10:58:43 2024 -0500

    WIP(groups): refactored and revised landing designs
 2024-09-11 15:02:10 -05:00
Sabe Jones 9934e59629 Squashed commit of the following: 
commit ddcc3a87451f60f6bc50759c56d8872b4e82496a
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Thu Sep 5 12:42:32 2024 -0400

    update mixin to add onlyOwner and quest title

commit bc1f75270bb4207a352fc9a24dad23e03d3f94c2
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Wed Sep 4 16:15:42 2024 -0400

    popover fix to difficulty but breaks img and quest title
 2024-09-11 14:59:53 -05:00
Sabe Jones 946ade5da1 Merge commit from fork 
Co-authored-by: Sabe Jones <sabe@habitica.com>
 2024-09-11 13:53:03 -05:00
Sabe Jones d7c9a7874b fix(dailies): remove broken tz plugin 2024-09-09 12:20:55 -05:00
dependabot[bot] 09a0e75351 Bump webpack from 5.89.0 to 5.94.0 in /website/client (#15305) 
Bumps [webpack](https://github.com/webpack/webpack) from 5.89.0 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.89.0...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-09-03 18:11:49 -05:00
dependabot[bot] 644edc5b76 Bump micromatch from 4.0.5 to 4.0.8 in /website/client (#15306) 
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-09-03 18:11:35 -05:00
Sabe Jones fb626ebf7e Squashed commit of the following: 
commit 613e6af7f0dfa3862dff117fadbb7194a29b8dbd
Author: Sabe Jones <sabe@habitica.com>
Date:   Tue Sep 3 16:57:02 2024 -0500

    feat(promo): add canonical dates for gem sales

commit 8e2fbebf3c663b0d5af5c10f3019726dbed1ca31
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 23 17:08:20 2024 -0500

    fix(gems): correct Gem amounts during sale

commit 85853c697ba8eb5e6d0e053e1fe1eab295028f23
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 16 16:57:02 2024 -0500

    fix(event): show user timezone to compare to UTC

commit a0a312a315cb2efad0db9370109cb036a8af0b0a
Author: Sabe Jones <sabe@habitica.com>
Date:   Fri Aug 16 15:49:08 2024 -0500

    refactor(promo): add UTC parenthetical
 2024-09-03 17:03:21 -05:00
Phillip Thelen 7878761b6f Fix debug footer layout (#15308) 2024-08-30 08:29:56 -05:00
Phillip Thelen d3b63abdd3 🧑‍💼🎛️ Overhaul (#15270) 
* Add option to search for users by email or username in admin panel

* Make Admin panel design more consistent

* fix test

* fix width of items

* escape regex for searching users

* load own user when pressing enter on empty field

* add styling for warning buttons

* improve sub styling

* fix checkbox alignment in admin panel

* Unify date preview display

* Fix bottom button display

* admin panel display improvements

* remove autocannon file

* search improvements

* time travel button display fix

* fix loading spinner

* fix sorting

* Split email search into multiple queries

* fix email search

* remove console

* fix line break
 2024-08-29 09:15:45 -05:00
Sabe Jones 88558e6b98 fix(rebirth): add missing await #15300 @CuriousMagpie 2024-08-29 08:42:26 -05:00
Natalie 949f638b6e 2024-09 Content Prebuild (#15295) 
* 202409 subscriber gear

* 2024-09 enchanted armoire gear

* 2024 fall festival gear

* 2024-09 background

* 2024-09 pet quest

* typos and update featuredItems.js

* quest and typo fix

* fix subscriber set name

* text amendments

* update quest title
 2024-08-23 12:47:25 -05:00
Phillip Thelen 99b2ee273f Fix issues with task scoring and in-app-reward retrieval (#15294) 
* remove obsolete class and computed

* correctly load equipped gear

* load purchased for in app rewards
 2024-08-15 10:38:20 -05:00
Natalie 2a2c1af7ba Add rage button to debug menu (#15291) 
* + Rage

* tinkering

* remove if statement wrapper and modify error message

* add test cases

* more work on test cases

* adding contexts to test cases

* test(debug): fix up tests

* fix(lint): whisepate

---------

Co-authored-by: Sabe Jones <sabe@habitica.com>
 2024-08-13 00:34:37 -05:00
Phillip Thelen 54d075e4fd Correctly load bootstrap radio component (#15293) 2024-08-12 10:53:35 -05:00
Phillip Thelen 5784694dc9 fix loading user data in app.vue (#15292) 
* fix handling user version

* fix notification display
 2024-08-09 08:36:06 -05:00
Phillip Thelen 7af4a6ff11 load sounds from aws (#15249) 2024-08-06 15:04:16 -05:00
Phillip Thelen a601be0666 Don’t load browser-script again if it’s already the correct language (#15263) 2024-08-06 15:03:26 -05:00
Phillip Thelen 1be169a105 Reduce size of client js bundles (#15264) 
* add packages

* Only include the needed parts of BootstrapVue

* remove yargs from client

* treeshake validator library

* formatting

* fix import
 2024-08-06 12:53:44 -05:00
Phillip Thelen 6b02af69f2 Refactor the root App to load less data for front page visits (#15265) 
* refactor root app to not load everything when visiting landing page

# Conflicts:
#	website/client/src/app.vue

* fix lint

* fix hiding loading screen

* fix showing snackbars when not logged in

* remove console
 2024-08-06 12:49:14 -05:00
Natalie ce0e8284fe Update static navbar on mobile (#15289) 
* update logo on static pages (mobile)

* remove typo
 2024-08-02 09:43:32 -05:00
Natalie 7f6ae8ffbf Navigation Bar Visual Improvements (#15278) 
* update privacy policy

* Fix serving memoized content

* add missing info to mystery item strings

* add missing string info to July mystery items

* fix food

* melior updates - loading screen & menu bar

* updates to currency tray spacing

* table styling

* one last table style

* add margin adjustment

* fix spacing

* clean up spacing styles

* remove table rounded corners

* correct faq tyops

* spacing updates

* fix web challenge instructions

* beach umbrella you are not shady except when you are

* fix mobile margin weirdness

* update wording on answers

* mobile spacing

* add chart showing details of item 1.4

* revert unrelated changes

* melior centering and icon spacing

* remove unnecessary files

* rejiggering spacing

* remove errant comma

* remove unnecessary files

* remove duplicated class

* remove duplicated class

* ...and more spacing

* notification bubble

* notification icon & currency alignment

* fix(CSS): clean up some unnecessary classes

---------

Co-authored-by: Phillip Thelen <phillip@habitica.com>
Co-authored-by: Sabe Jones <sabe@habitica.com>
 2024-08-01 10:06:21 -05:00
Phillip Thelen 765e08f999 fix displaying if a pet is hatchable (#15281) 2024-07-30 12:16:43 -05:00
Sabe Jones 39ccddfb1c fix(customization): restore broken popovers 2024-07-29 16:17:33 -05:00
Sabe Jones 108214a217 fix(lint): remove console statement 2024-07-29 14:15:47 -05:00
Sabe Jones 271f40e355 Squashed commit of the following: 
commit 8ed95731cb
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Jul 23 17:59:56 2024 +0200

    fix hatched dialog

commit 53242ad96c
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Jul 23 17:38:13 2024 +0200

    fix popover not showing

commit ce4bfd25bd
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Jul 3 17:28:30 2024 +0200

    move item popover to own component

commit 2e6a300c46
Author: Phillip Thelen <phillip@habitica.com>
Date:   Mon Jul 1 18:48:24 2024 +0200

    make scaled sprites look nice

commit a3cbadb8c2
Author: Phillip Thelen <phillip@habitica.com>
Date:   Mon Jul 1 18:48:17 2024 +0200

    fix hatching dialog

commit 0e5126df5e
Author: Phillip Thelen <phillip@habitica.com>
Date:   Mon Jul 1 18:48:12 2024 +0200

    fix popover alignment

commit 7362af9236
Author: Phillip Thelen <phillip@habitica.com>
Date:   Fri Jun 28 17:07:03 2024 +0200

    fix item display

commit cf353efdb7
Author: Phillip Thelen <phillip@habitica.com>
Date:   Fri Jun 28 16:59:13 2024 +0200

    fix pet display

commit caf0cba9f2
Author: Phillip Thelen <phillip@habitica.com>
Date:   Fri Jun 28 15:24:39 2024 +0200

    fix background icon display

commit 3b06febc01
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Jun 26 12:30:04 2024 +0200

    fix sprites for notifications

commit 160b2debdc
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Jun 26 10:35:13 2024 +0200

    fix gear display in profile

commit b200a2f17d
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Jun 26 10:28:11 2024 +0200

    fix sprites for keys to the kennel

commit 3614e7a8fb
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Jun 26 10:28:00 2024 +0200

    fix sprites on avatar customization

commit 35f993d055
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Jun 26 09:18:41 2024 +0200

    fix hover icons

commit 28fc80115e
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Jun 11 16:50:37 2024 +0200

    remove console

commit b041c67679
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Jun 11 15:18:44 2024 +0200

    more lint fixes

commit f4261d0440
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Jun 11 15:18:16 2024 +0200

    fix lint

commit 878ee8f77b
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Jun 11 13:23:08 2024 +0200

    support gifs

commit aac24715aa
Author: Phillip Thelen <phillip@habitica.com>
Date:   Tue Jun 11 13:15:52 2024 +0200

    move avatar customization to sprites

commit f4d3663130
Author: Phillip Thelen <phillip@habitica.com>
Date:   Fri Jun 7 17:25:19 2024 +0200

    Move more sprites out of css

commit 6e6b4c981a
Author: Phillip Thelen <phillip@habitica.com>
Date:   Fri Jun 7 16:59:30 2024 +0200

    add new sprite to item and shopItem component

commit 8712413f5d
Author: Phillip Thelen <phillip@habitica.com>
Date:   Fri Jun 7 16:37:24 2024 +0200

    use new sprites for pets list

commit 1172893826
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Jun 5 09:43:51 2024 +0200

    Begin building new system for loading sprites
 2024-07-29 14:10:27 -05:00