* chore(content): add winter wonderland items
* chore(typos): dates are hard
* fix(tz): how far back we have fallen
* fix(event): four extra hours for stragglers
* fix(typo): singular snowball spell
* fix(gear): remove stray incorrect event prop
* merge release
* Revert "merge release"
This reverts commit 83e29d0288.
* feat(content): add EN text
* fix(dates): 2022-2023 Winter
* chore(content): add featured quest bundle
* fix(event): delay Snowballs, add quests to Seasonal Shop
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
* 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>
* 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>
* Don't sign in user when trying to connect a social account that was already created
* Log social users into matching local auth accounts
If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account
* If possible set local authentication email for social users
* Allow password reset emails to be sent to social login users
* lint fixes
* Fix issues and tests
* fix tests
* Fix lint error.
* purge Facebook.
Only keep it in some select places to allow for some compatablilty.
* Fix error
* fix error
* Let settings handle it when you don't have a password set but an email
* fix error
* Fix boolean logic
* fix json conversion
* .
* fix password reset for old social accounts
* Don't sign in user when trying to connect a social account that was already created
* Log social users into matching local auth accounts
If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account
* If possible set local authentication email for social users
* Allow password reset emails to be sent to social login users
* lint fixes
* Fix issues and tests
* fix tests
* Fix lint error.
* purge Facebook.
Only keep it in some select places to allow for some compatablilty.
* Fix error
* fix error
* Let settings handle it when you don't have a password set but an email
* fix error
* Fix boolean logic
* fix json conversion
* fix password reset for old social accounts
* Revert "lint fixes"
This reverts commit c244b1651c.
# Conflicts:
# website/client/src/components/auth/registerLoginReset.vue
# website/client/src/components/static/contact.vue
* Revert "fix password reset for old social accounts"
This reverts commit 7e0069a80f.
* fix duplicate code
* chore(misc): remove irrelevant changes
* chore(privacy): update policy page with note about FB
Co-authored-by: SabreCat <sabe@habitica.com>
* chore(submodule): add August 2022 Mystery Items
* chore(content): add September 2022 Backgrounds and Enchanted Armoire Items
* fix(typo): periods so people don't grumble
* fix(typo): consistent caps
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Natalie L