eb820a2902
build(deps): bump @storybook/addon-actions in /website/client ( #13839 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.4.17 to 6.4.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.18/addons/actions )
---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-08 12:14:42 -05:00
df3447afa6
build(deps): bump @storybook/addons in /website/client ( #13824 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.4.17 to 6.4.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.18/lib/addons )
---
updated-dependencies:
- dependency-name: "@storybook/addons"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-08 12:12:37 -05:00
9e740e7092
fix(heroes): still more indents
2022-02-08 11:10:39 -06:00
169634f205
fix(heroes): remove broken td and correct indentation
2022-02-08 11:09:05 -06:00
094cf899d8
fix(heroes): remove duplicated column
2022-02-08 10:39:11 -06:00
fd4d139fc2
Merge remote-tracking branch 'CuriousMagpie/2022-02-backgrounds-armoire' into develop
2022-02-07 10:51:23 -06:00
ca4df96902
Merge branch 'release' into develop
2022-02-01 15:29:35 -06:00
9e5948df64
chore(sprites): compile
2022-02-01 15:21:03 -06:00
83c2e1774b
Merge remote-tracking branch 'CuriousMagpie/zodiac-zookeeper' into release
2022-02-01 14:30:02 -06:00
844e0d7cf4
fix(dependencies): add moment-timezone
2022-01-31 22:19:03 -06:00
fb73ec3ad9
Merge remote-tracking branch 'Lyqst/news-post-datetime' into develop
2022-01-31 15:41:33 -06:00
e7dc233fc9
Merge remote-tracking branch 'origin/feature/sprites-cdn' into develop
2022-01-31 15:40:27 -06:00
6e43d4dc79
Add Transaction log for gem and hourglass changes ( #13589 )
...
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* fix failing test
* Fix minor inconsistencies
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* Fix minor inconsistencies
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-01-31 15:36:15 -06:00
5beb29305d
Fix selection highlight in avatar editor ( #13746 )
2022-01-31 15:35:17 -06:00
de477ebb4a
Revert "Revert "Revert "Prerequisites to removing Facebook authentication ( #13683 )"""
...
This reverts commit e3ffd7acbc
2022-01-31 14:52:22 -06:00
a2f50815d8
build(deps): bump @storybook/addons in /website/client ( #13809 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.4.14 to 6.4.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.17/lib/addons )
---
updated-dependencies:
- dependency-name: "@storybook/addons"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 14:03:03 -05:00
f647f8080d
build(deps): bump @storybook/addon-links in /website/client ( #13802 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.4.14 to 6.4.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.17/addons/links )
---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 12:30:37 -05:00
ec83a7e213
build(deps): bump amplitude-js from 8.16.0 to 8.16.1 in /website/client ( #13810 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.16.0 to 8.16.1.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases )
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md )
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.16.0...v8.16.1 )
---
updated-dependencies:
- dependency-name: amplitude-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 12:27:44 -05:00
94c7b0d62c
build(deps): bump chai from 4.3.4 to 4.3.6 in /website/client ( #13806 )
...
Bumps [chai](https://github.com/chaijs/chai ) from 4.3.4 to 4.3.6.
- [Release notes](https://github.com/chaijs/chai/releases )
- [Changelog](https://github.com/chaijs/chai/blob/4.x.x/History.md )
- [Commits](https://github.com/chaijs/chai/compare/v4.3.4...v4.3.6 )
---
updated-dependencies:
- dependency-name: chai
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 12:26:45 -05:00
ba9a65c500
chore(sprites): compile
2022-01-31 10:58:02 -06:00
1bdea0dda3
build(deps): bump @storybook/addon-actions in /website/client ( #13814 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.4.14 to 6.4.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.17/addons/actions )
---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 10:05:52 -06:00
f2f3a1f0eb
added Zodiac Zookeeper achievement
2022-01-28 17:14:50 -05:00
1a76ad5dca
fix(news): use Moment timezone package
2022-01-27 15:54:03 -06:00
988f594298
Merge branch 'develop' into news-post-datetime
2022-01-27 15:34:18 -06:00
e3ffd7acbc
Revert "Revert "Prerequisites to removing Facebook authentication ( #13683 )""
...
This reverts commit b3c466ad5a
2022-01-27 14:50:04 -06:00
84fcb1d4ad
Merge branch 'HabitRPG:develop' into 2022-02-backgrounds-armoire
2022-01-27 14:35:49 -05:00
8637d55d2b
changed a few stray 2021s to 2022
2022-01-26 16:45:54 -05:00
e687140cfc
build(deps): bump @storybook/addons in /website/client ( #13789 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.4.13 to 6.4.14.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.14/lib/addons )
---
updated-dependencies:
- dependency-name: "@storybook/addons"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-26 11:20:34 -05:00
c4d0f82673
build(deps): bump axios from 0.24.0 to 0.25.0 in /website/client ( #13790 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.24.0...v0.25.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-26 11:20:11 -05:00
755ff8d22d
build(deps): bump @storybook/addon-actions in /website/client ( #13785 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.4.13 to 6.4.14.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.14/addons/actions )
---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 13:12:55 -05:00
2ec1fc20db
build(deps): bump amplitude-js from 8.15.0 to 8.16.0 in /website/client ( #13791 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.15.0 to 8.16.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases )
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md )
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.15.0...v8.16.0 )
---
updated-dependencies:
- dependency-name: amplitude-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 13:09:25 -05:00
92e8e24bfc
build(deps): bump @storybook/addon-links in /website/client ( #13783 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.4.13 to 6.4.14.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.14/addons/links )
---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 12:43:40 -05:00
a0860e62e8
build(deps): bump nanoid from 3.1.30 to 3.2.0 in /website/client ( #13778 )
...
Bumps [nanoid](https://github.com/ai/nanoid ) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases )
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0 )
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 12:30:47 -05:00
b3c466ad5a
Revert "Prerequisites to removing Facebook authentication ( #13683 )"
...
This reverts commit 1177ad8b8c
2022-01-25 09:30:37 -06:00
1177ad8b8c
Prerequisites to removing Facebook authentication ( #13683 )
...
* 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.
2022-01-21 15:15:58 -06:00
f01c352969
fix(chat): Enter key improvement by @maryketa
2022-01-21 14:55:34 -06:00
cfc35f62a8
build(deps): bump @storybook/addon-actions in /website/client ( #13768 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.4.10 to 6.4.13.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.13/addons/actions )
---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-20 15:27:52 -06:00
a6010e7097
build(deps): bump @storybook/addons in /website/client ( #13756 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.4.10 to 6.4.13.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.13/lib/addons )
---
updated-dependencies:
- dependency-name: "@storybook/addons"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 10:49:03 -05:00
0fe40e6ba8
build(deps): bump core-js from 3.20.2 to 3.20.3 in /website/client ( #13764 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.20.2 to 3.20.3.
- [Release notes](https://github.com/zloirock/core-js/releases )
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zloirock/core-js/compare/v3.20.2...v3.20.3 )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-19 10:48:31 -05:00
20d18c701d
build(deps): bump @storybook/addon-links in /website/client ( #13754 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.4.10 to 6.4.13.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.13/addons/links )
---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-17 16:26:44 -05:00
b4e782baa5
build(deps): bump follow-redirects in /website/client ( #13748 )
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-17 16:16:15 -05:00
f0c50386f4
build(deps): bump @storybook/addons in /website/client ( #13743 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.4.9 to 6.4.10.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.10/lib/addons )
---
updated-dependencies:
- dependency-name: "@storybook/addons"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-11 12:40:37 -05:00
d881c03ba9
build(deps): bump @storybook/addon-links in /website/client ( #13739 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.4.9 to 6.4.10.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.10/addons/links )
---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-10 16:16:36 -05:00
a4ffefdc54
build(deps): bump @storybook/vue in /website/client ( #13745 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 6.3.12 to 6.3.13.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.13/app/vue )
---
updated-dependencies:
- dependency-name: "@storybook/vue"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-10 11:28:00 -05:00
01e8809abf
build(deps): bump amplitude-js from 8.14.1 to 8.15.0 in /website/client ( #13742 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.14.1 to 8.15.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases )
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md )
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.14.1...v8.15.0 )
---
updated-dependencies:
- dependency-name: amplitude-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-10 11:27:18 -05:00
4682223235
build(deps): bump @storybook/addon-actions in /website/client ( #13736 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.4.9 to 6.4.10.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.10/addons/actions )
---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-10 11:24:48 -05:00
21a3a81d5b
Sprites: only create the css which points to the CDN
2022-01-07 22:12:43 +01:00
039851a8c2
Merge branch 'release' into develop
2022-01-06 16:28:58 -06:00
586801a1cf
chore(sprites): compile
2022-01-06 16:28:29 -06:00
82ad85e564
feat(content): Armoire and Backgrounds Jan 2022
2022-01-06 16:28:16 -06:00
dependabot[bot]