negue 576c80af7e Merge remote-tracking branch 'origin/develop' into negue/ui/setting ...

# Conflicts:
#	website/client/src/components/payments/selectUserModal.vue
#	website/client/src/components/settings/site.vue
#	website/client/src/router/index.js

2023-03-14 21:04:05 +01:00

..

appearance

feat(content): March backgrounds and Enchanted Armoire items (#14524)

2023-03-06 16:57:56 -06:00

constants

Merge remote-tracking branch 'origin/develop' into negue/ui/setting

2023-03-14 21:04:05 +01:00

gear

feat(content): March backgrounds and Enchanted Armoire items (#14524)

2023-03-06 16:57:56 -06:00

quests

chore(content): add Pink Marble Magic Hatching Potion (#14497)

2023-02-12 23:17:56 -06:00

achievements.js

chore(content): add Polar Pro achievement (#14399)

2022-12-13 14:50:53 -06:00

bundles.js

chore(content): add pet quest bundle and magic hatching potions for February (#14499)

2023-02-12 23:17:09 -06:00

categoryOptions.js

chore(i18n): update locale files

2022-11-08 10:17:40 -06:00

eggs.js

start upgrading eslint

2019-10-08 16:57:10 +02:00

faq.js

Refactor FAQ (#14372)

2022-12-15 11:34:07 -06:00

gems.js

Fall Festival Gem Promo (#138)

2020-09-21 16:22:13 +02:00

hatching-potions.js

chore(content): add Pink Marble Magic Hatching Potion (#14497)

2023-02-12 23:17:56 -06:00

index.js

feat(event): Pi Day

2023-03-14 09:12:39 -05:00

loginIncentives.js

Fix: reassign object for user.items.quest to trigger change in vue view

2019-12-15 22:18:26 +03:00

mystery-sets.js

fix(fix): hide future mystery sets in Time Travel shop

2021-04-02 15:50:20 -05:00

officialPinnedItems.js

chore: update sub-deps and fix lint

2020-07-01 18:20:18 +02:00

quests.js

Fix: Inconsistent Quest Unlock Behavior (#13734)

2022-05-05 16:51:47 -05:00

shop-featuredItems.js

chore(content): add pet quest bundle and magic hatching potions for February (#14499)

2023-02-12 23:17:09 -06:00

spells.js

fix(event): correct logic for various Valentine's items

2023-02-13 11:25:02 -06:00

stable.js

feat(event): 10th Birthday Bash

2023-01-20 16:14:33 -06:00

subscriptionBlocks.js

start fixing commong

2019-10-09 16:51:17 +02:00

tasks.js

start fixing commong

2019-10-09 16:51:17 +02:00

time-travelers.js

fix(shop): don't show current month's mystery set in time travelers (#13492)

2021-11-12 10:48:07 -06:00

translation.js

fix exports

2019-10-01 17:53:48 +02:00