* 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>
* first pass
* second pass
* third pass
* fourth pass, not a lot of progress
* fifth pass, slowly gettin there
* breakpoint nonsense
* flexbox and breakpoint nonsense
* svg updates, css updates
* whitespace
* chore: merge upstream/develop
* style(breakpoints): added responsive breakpoints, social column alignment tweaks
* style(breakpoints): add xs-specific selectors and classes
* style: mobile footer
* style: mobile footer
* style: static landing page footer
* style: small tweaks to social layout
* fix(translations): update website/common/locales/de/gear.json to develop
* update(style): small updates
* update(style): cleaning up code
* update(style): cleaning up code
* update(style): mobile footer updates
* update(style): complete mobile footer & clean up code
* update(style): add tablet breakpoint and remove rogue terms link
* fix(style): update to scoped colors & set footer background image to pointer-events:none
* fix(style): removed redundant logo class definition
* 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>
* first pass
* second pass
* third pass
* fourth pass, not a lot of progress
* fifth pass, slowly gettin there
* breakpoint nonsense
* flexbox and breakpoint nonsense
* svg updates, css updates
* whitespace
* chore: merge upstream/develop
* style(breakpoints): added responsive breakpoints, social column alignment tweaks
* style(breakpoints): add xs-specific selectors and classes
* style: mobile footer
* style: mobile footer
* style: static landing page footer
* style: small tweaks to social layout
* fix(translations): update website/common/locales/de/gear.json to develop
* update(style): small updates
* update(style): cleaning up code
* update(style): cleaning up code
* update(style): mobile footer updates
* update(style): complete mobile footer & clean up code
* update(style): add tablet breakpoint and remove rogue terms link
* fix(string): questVice1Notes html changed to a mobile-device friendly format
* fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order
* fix(string): remove extra word from headSpecialSummer2022WarriorNotes
* fix(string): corrected armorSpecialSummer2022MageNotes
* fix: remove duplicated string and adjust upgrade button style
* fix(style): set border radii to 8px on upgrading-group id
* fix(payments): remove duplicate entry from another modal
Co-authored-by: SabreCat <sabe@habitica.com>
Fix props' change handler which is called when guild is changed from
notification.
Tests:
+ Guild challenges updated successfully when guild is changed from
notification center.
Co-authored-by: neel <neel@helpshift.com>
* disable spell if user doesn't have enough mana
* differenciate insufficient mana and disabled spell
* linting
* reduce opacity, no hover state when insufficient mana
* display that lvl insufficient in spell tooltip
* change spell text color when spell has no effect
change spell-text color to blue-500 when spell has no effect
Sky Chrastina