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

# Conflicts:
#	package-lock.json
#	website/client/src/components/settings/site.vue
#	website/client/src/components/tasks/column.vue
#	website/server/models/user/schema.js

2023-05-30 19:54:06 +02:00

..

appearance

feat(content): add May Backgrounds and Enchanted Armoire items (#14628)

2023-05-09 10:26:00 -05:00

constants

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

2023-05-30 19:54:06 +02:00

gear

feat(content): add May Backgrounds and Enchanted Armoire items (#14628)

2023-05-09 10:26:00 -05:00

quests

feat(cont): 2023 Spring Fling content (#14525)

2023-03-17 15:05:04 -05:00

achievements.js

Squashed commit of the following:

2023-05-22 15:13:49 -05:00

bundles.js

feat(content): add May pet quest bundle

2023-05-17 10:49:37 -04: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

Squashed commit of the following:

2023-05-02 09:51:33 -05:00

gems.js

Fall Festival Gem Promo (#138)

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

hatching-potions.js

feat(content): add May magic hatching potions (#14641)

2023-05-15 15:59:49 -05: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

feat(content): add May pet quest bundle

2023-05-17 10:49:37 -04:00

spells.js

Database Access optimisations (#14544)

2023-05-16 12:21:45 -05: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