bec75c6e12
reset account + password required in api
2023-02-05 18:52:54 +01:00
7ffb5101be
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
...
# Conflicts:
# website/client/src/components/header/notificationsDropdown.vue
2023-01-30 22:47:05 +01:00
e1deb6adff
fix(payments): add missing SKU variations
2023-01-22 23:21:22 -06:00
f845bbd7a0
fix(payments): address some test failures
2023-01-22 22:30:48 -06:00
0dfc8de300
fix(lint): remove extraneous import
2023-01-20 16:25:24 -06:00
e5bbde7e97
feat(event): 10th Birthday Bash
...
with @CuriousMagpie and @phillipthelen
2023-01-20 16:14:33 -06:00
bef8a4cdfc
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
2023-01-07 22:10:53 +01:00
98c4910051
Merge branch 'release' into develop
2022-12-23 15:35:20 -06:00
55e7ef138e
chore(content): add NYE party hat and migration script ( #14419 )
...
* chore(content): add NYE party hat and migration script
* chore(subproj): update habitica-images
* chore(sprites): corrected sprite CSS run
* fix(event): unbork migration, add latecomer hook
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-23 15:35:23 -06:00
38198d7df6
WIP class setting
2022-12-20 22:36:27 +01:00
079279e5c1
Revert "fix(tests): if singleton event, always provide empty string suffix"
...
This reverts commit 64bf4ee4b6
2022-12-20 09:51:24 -06:00
6d33ec02a8
Merge branch 'release' into develop
2022-12-19 16:24:48 -06:00
64bf4ee4b6
fix(tests): if singleton event, always provide empty string suffix
2022-12-19 16:22:20 -06:00
1f59d95465
Merge branch 'sabrecat/pass-change-max' into release
2022-12-15 15:02:05 -06:00
cdd1bf1cf0
added field to updates to remove rewarded gear from pinned items, if present ( #14406 )
2022-12-15 14:48:22 -06:00
42e0bad4ac
added validation for blocked users when inviting to groups by username ( #14316 )
2022-12-15 14:47:54 -06:00
b97da5fe57
Add support for getting chat limit from database ( #14392 )
...
* Add support for getting chat limit from database
* fix lint error
2022-12-15 14:38:28 -06:00
2c9ee04c6d
Optimise chat storage by not storing both equipped and costume ( #14409 )
...
* don’t store both equipped and costume
* fix lint
2022-12-15 14:30:15 -06:00
1587827b22
Merge branch 'develop' into release
2022-12-15 14:04:11 -06:00
eb2cb9e921
Refactor FAQ ( #14372 )
...
* refactor(faq): fetch from API on web
Also make question list more maintainable, allowing different questions across platforms
* fix(tests): don't return null when function is expected
Also removes the unnecessary default to web in controller
* fix(tests): add new fields to expectation, add placeholders
* refactor(faq): allow reordering
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-15 11:34:07 -06:00
573c932565
chore(content): add Polar Pro achievement ( #14399 )
...
* chore(content): add Polar Pro achievement
* chore(script): add migration script
* fix(typo): rogue backticks
* fix(capitalization): revert css blurp
* fix(migration): no babby wuff
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-13 14:50:53 -06:00
df25e0574d
fix(auth): enforce max pass length at update
2022-12-05 16:36:42 -06:00
a8e9c9bc70
chore(event): set up Harvest Feast 2022
2022-11-21 18:54:57 -06:00
f1fa6a8456
Revert "Allow sub upgrades/downgrades on iOS ( #14303 )"
...
This reverts commit 9e98e56e9b
2022-11-21 16:40:56 -06:00
82c5e40b92
Enforce maximum password length ( #14290 )
...
* fix(auth): enforce maximum password length
* fix(auth): line length and better error message
* fix(auth): correctly import/export constant
Co-authored-by: SabreCat <sabe@habitica.com >
2022-11-18 16:49:10 -06:00
116068effa
fix(apiDescription): remove incorrect information ( #14367 )
2022-11-18 16:21:03 -06:00
f2aaee15f3
Merge branch 'release' into develop
2022-11-18 15:29:06 -06:00
15353eba8a
fix(subs): roll all the way back, didn't work :(
2022-11-18 15:12:14 -06:00
febffb3f07
Revert "Fix double subscriptions, second attempt ( #14345 )"
...
This reverts commit 1a5cba57b7
2022-11-18 14:26:49 -06:00
fdfa2d6df4
Merge branch 'release' into develop
2022-11-15 19:29:37 -06:00
259131ee3f
feat(transactions): UI updates
...
by @negue
2022-11-15 19:28:36 -06:00
1a5cba57b7
Fix double subscriptions, second attempt ( #14345 )
...
* fix(subscriptions): reject subs that come in too fast
* fix(lint): remove unused import
* fix(groups): individual subs may come rapidly
* fix(subscriptions): bad paren, handle rapid testing
* fix(test): reset dateUpdated between subs
* fix(test): one more block for dateUpdated
Co-authored-by: SabreCat <sabe@habitica.com >
2022-11-15 19:19:37 -06:00
6ee06f76e4
chore(i18n): update locale files
...
Also includes two fixes: empty Hourglass transaction logging and missing Recovery + Support guild category
2022-11-08 10:17:40 -06:00
f6e5360bdd
Merge branch 'release' into develop
2022-11-02 14:54:09 -05:00
9b1a726875
Revert "feat(subs): allow upgrade/downgrade on iOS"
...
This reverts commit 27440772f0
2022-11-02 09:00:29 -05:00
9e98e56e9b
Allow sub upgrades/downgrades on iOS ( #14303 )
...
* Allow sub upgrades/downgrades on iOS
* fix check
* fix(lint): line length
* fix(typo): customER
* fix tests
* Implement correct handling for when subs are up/downgraded
* fix lint errors
* fix test
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-11-01 21:07:23 -05:00
27440772f0
feat(subs): allow upgrade/downgrade on iOS
...
by @phillipthelen
2022-11-01 20:53:04 -05:00
aea0be3245
fix(subs): establish lock to prevent race condition
2022-11-01 20:47:21 -05:00
3bc82a6692
chore(content): add Bone to Pick achievement ( #14318 )
...
* chore(content): add Bone to Pick achievement
* chore(content): update spritesmith-main.css
* chore(content): add more bone picking
* chore(content): more bone picking
* chore(content): bone picking
* chore(content): i gotta bone to pick here
* chore(content): final bone picking
* chore: add migration script
* chore: update habitica-images
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-31 14:19:56 -05:00
f7a03d2eb5
improve transactions logs + split createSubscription ( #14289 )
...
* improve transactions logs + split createSubscription
2022-10-27 08:39:06 +02:00
90250d1a25
Establish lock to avoid race scenario in subscriptions ( #14267 )
...
* fix(subscription): establish lock to avoid race scenario
* fix(lint): import syntax
* fix(lint): whitespace, dependency cycle
* fix(subs): skip locking on gifts and groups
* fix(subs): correctly reset _subSignature
* fix(sub): use findOneAndUpdate for unlock
* fix(test): save newly created user for some reason
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-25 16:44:33 -05:00
a4326498d1
Group category update issue ( #14186 )
...
* Overwrite arrays instead of merging
* Test removing a category
* Fix previous duplicated categories on group edit
2022-10-12 15:51:56 -05:00
137f7d53dc
add qty param for gem/gem-purchasable item apidoc ( #14219 )
...
* add qty param for gem/gem-purchasable item
* fix(lint): remove extra whitespace
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-07 16:33:38 -05:00
8cd9536bdc
Merge branch 'develop' into release
2022-09-30 15:25:27 -05:00
57d3fea523
Merge branch 'group-tracking-modal' into release
2022-09-30 14:47:08 -05:00
7db093d2bb
Merge branch 'sabrecat/panel-subscription' into release
2022-09-30 14:46:10 -05:00
eea79ce1b6
Merge branch 'develop' into sabrecat/gems-multi-event
2022-09-21 16:03:57 -05:00
e9ee2d3fdd
Transaction username mongodb mutation ( #14231 )
...
* migrate newest usernames in transactions
* fix lint
* change the parameters
2022-09-21 14:42:39 -05:00
004f1ee2dc
Merge branch 'develop' into sabrecat/panel-subscription
2022-09-20 15:11:29 -05:00
719fab8d4b
chore: merge develop in
2022-09-16 16:12:34 -04:00
negue