5890b04e30
Merge branch 'release' into develop
2022-03-23 20:21:13 -05:00
d6e64482d6
chore(sprites): update CSS
2022-03-22 16:52:48 -05:00
47dd711ab9
Merge branch 'release' into develop
2022-03-22 10:37:51 -05:00
ad9c468e77
fix(event): CSS build, small fixes
2022-03-22 10:34:44 -05:00
5320de93a8
Merge branch 'release' into develop
2022-03-09 16:18:08 -06:00
52d1480844
chore(sprites): build CSS
2022-03-09 16:16:44 -06:00
aa1b9a5e94
added achievement Birds of a Feather
2022-03-08 12:43:38 -05:00
080f7ece30
Merge branch 'release' into develop
2022-02-28 09:49:44 -06:00
05a54e505c
chore(mystery): update images, run sprites
2022-02-28 09:49:21 -06:00
1393863e12
build(deps): bump intro.js from 4.3.0 to 5.0.0 in /website/client ( #13834 )
...
Bumps [intro.js](https://github.com/usablica/intro.js ) from 4.3.0 to 5.0.0.
- [Release notes](https://github.com/usablica/intro.js/releases )
- [Commits](https://github.com/usablica/intro.js/compare/v4.3.0...v5.0.0 )
---
updated-dependencies:
- dependency-name: intro.js
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-21 15:00:38 -06:00
cb6d3cc9ca
build(deps): bump @storybook/addons in /website/client ( #13850 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.4.18 to 6.4.19.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.19/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.19/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-15 14:01:40 -05:00
f1b6d95a84
build(deps): bump amplitude-js from 8.16.1 to 8.17.0 in /website/client ( #13855 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.16.1 to 8.17.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.16.1...v8.17.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-02-15 13:44:49 -05:00
b7e796f644
build(deps): bump @storybook/addon-actions in /website/client ( #13857 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.4.18 to 6.4.19.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.19/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.19/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-15 13:43:33 -05:00
ef36d655b0
Merge branch 'develop' of https://github.com/HabitRPG/habitica into develop
2022-02-14 16:37:55 -05:00
cf3b9bac4e
build(deps): bump tar from 4.4.8 to 4.4.19 in /website/client
2022-02-14 14:52:43 -06:00
d2c545620b
build(deps): bump core-js from 3.20.3 to 3.21.0 in /website/client ( #13838 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.20.3 to 3.21.0.
- [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.3...v3.21.0 )
---
updated-dependencies:
- dependency-name: core-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-02-14 14:49:28 -06:00
c7c89255d8
build(deps): bump @storybook/addon-links in /website/client ( #13831 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) 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/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-02-14 14:49:17 -06:00
d9e2069995
fix(packages) new fix attempt from last known good
2022-02-14 14:37:26 -06:00
b5fa4ff3d5
build(deps): bump tar from 4.4.8 to 4.4.19 in /website/client ( #13815 )
...
Bumps [tar](https://github.com/npm/node-tar ) from 4.4.8 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases )
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md )
- [Commits](https://github.com/npm/node-tar/compare/v4.4.8...v4.4.19 )
---
updated-dependencies:
- dependency-name: tar
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-10 11:42:39 -05:00
8efaf9b47f
build(deps): bump core-js from 3.20.3 to 3.21.0 in /website/client ( #13838 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.20.3 to 3.21.0.
- [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.3...v3.21.0 )
---
updated-dependencies:
- dependency-name: core-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-02-10 11:41:51 -05:00
644e094f08
build(deps): bump @storybook/addon-links in /website/client ( #13831 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) 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/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-02-10 11:41:22 -05:00
81363feb26
revert Bailey datetime PR
2022-02-09 11:17:15 -06:00
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
SabreCat