0d444a9d6a
chore(content): prebuild July Enchanted Armoire and Backgrounds ( #14108 )
2022-07-06 14:30:40 -05:00
dcced2debb
chore(content): July 2022 Mystery Items ( #14095 )
...
* merge upstream/release into release
* chore(content): Added July 2022 Mystery Items
2022-06-29 14:02:46 -05:00
517fbc3c8e
fix(strings): error and omissions corrected ( #14085 )
...
* build(deps): bump @storybook/addons in /website/client (#14066 )
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.5.8 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/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>
* build(deps): bump jpeg-js from 0.4.3 to 0.4.4 (#14071 )
Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js ) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases )
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.3...v0.4.4 )
---
updated-dependencies:
- dependency-name: jpeg-js
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(string): questVice1Notes html changed to a mobile-device friendly format
* fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-21 13:48:26 -05:00
f0c25dab05
2022 Summer Gala Content ( #14067 )
...
* merge upstream/release into origin/release
* Revert "merge upstream/release into origin/release"
This reverts commit 902ed08cc3sabe@habitica.com >
2022-06-21 09:29:53 -05:00
239821a321
Merge branch 'sabrecat/teams-hotfixes' into release
2022-06-16 14:08:41 -05:00
5b20961908
build(deps): bump @storybook/addons in /website/client ( #14062 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.5.7 to 6.5.8.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.8/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.8/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-06-13 16:44:20 -04:00
f4fd5e221e
build(deps): bump @storybook/addon-links in /website/client ( #14061 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.5.7 to 6.5.8.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.8/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.8/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-06-13 16:44:07 -04:00
4be863de99
build(deps): bump @storybook/addon-actions in /website/client ( #14060 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.5.7 to 6.5.8.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.8/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.8/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-06-13 16:43:52 -04:00
4d10c53216
Further transition from HTTP to HTTPS ( #14039 )
2022-06-10 14:02:58 -05:00
bb37adb97b
build(deps): bump core-js from 3.22.7 to 3.22.8 in /website/client ( #14046 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.22.7 to 3.22.8.
- [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.22.7...v3.22.8 )
---
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-06-10 13:50:07 -04:00
0b1907fe07
fix(group-plans): shared completion, URL exploit
2022-06-08 16:46:22 -05:00
2fe1ac75d2
build(deps): bump @storybook/addon-links in /website/client ( #14048 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.5.6 to 6.5.7.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.7/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.7/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-06-06 16:35:34 -04:00
c0be7c77d1
build(deps): bump @storybook/addons in /website/client ( #14047 )
...
Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons ) from 6.4.19 to 6.5.7.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.7/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.7/lib/addons )
---
updated-dependencies:
- dependency-name: "@storybook/addons"
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-06-06 16:35:19 -04:00
37ff1c2c5c
build(deps): bump @storybook/addon-actions in /website/client ( #14045 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.5.6 to 6.5.7.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.7/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.7/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-06-06 16:34:57 -04:00
84046df884
build(deps): bump nconf from 0.11.3 to 0.12.0 in /website/client ( #14006 )
...
Bumps [nconf](https://github.com/flatiron/nconf ) from 0.11.3 to 0.12.0.
- [Release notes](https://github.com/flatiron/nconf/releases )
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flatiron/nconf/compare/v0.11.3...v0.12.0 )
---
updated-dependencies:
- dependency-name: nconf
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-06-06 16:32:13 -04:00
2cb724e6b2
Merge branch 'release' into develop
2022-06-06 15:14:36 -05:00
d76d5f2cf1
Merge branch 'sabrecat/sanitize-redirect' into release
2022-06-06 15:03:30 -05:00
2d1bf74858
June 2022 Backgrounds and Enchanted Armoire ( #14049 )
2022-06-06 14:55:38 -05:00
986ba1b8ba
chore(sprites): compile
2022-06-06 12:42:35 -05:00
c9671b5319
Styling Bugfix: 13772 ( #13983 )
2022-06-03 15:41:46 -05:00
2c311952c8
chore(packages): update locks
2022-06-03 14:04:45 -05:00
19c1484928
build(deps): bump amplitude-js from 8.17.0 to 8.18.4 in /website/client ( #14034 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.17.0 to 8.18.4.
- [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.17.0...v8.18.4 )
---
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-06-03 14:34:35 -04:00
9f135782ef
build(deps): bump vue-router from 3.5.3 to 3.5.4 in /website/client ( #14027 )
...
Bumps [vue-router](https://github.com/vuejs/router ) from 3.5.3 to 3.5.4.
- [Release notes](https://github.com/vuejs/router/releases )
- [Changelog](https://github.com/vuejs/router/blob/main/CHANGELOG.md )
- [Commits](https://github.com/vuejs/router/commits )
---
updated-dependencies:
- dependency-name: vue-router
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-06-03 14:30:51 -04:00
9eb959840b
build(deps): bump @storybook/addon-actions in /website/client ( #14028 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.4.19 to 6.5.6.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/actions )
---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
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-06-03 14:26:24 -04:00
7d11b22da0
build(deps): bump @storybook/addon-links in /website/client ( #14025 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.4.18 to 6.5.6.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/links )
---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
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-06-03 14:26:00 -04:00
84011f36b2
build(deps): bump moment from 2.29.1 to 2.29.3 in /website/client ( #13994 )
...
Bumps [moment](https://github.com/moment/moment ) from 2.29.1 to 2.29.3.
- [Release notes](https://github.com/moment/moment/releases )
- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md )
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.3 )
---
updated-dependencies:
- dependency-name: moment
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-06-03 14:24:17 -04:00
b9389f8430
build(deps): bump intro.js from 5.0.0 to 5.1.0 in /website/client ( #13999 )
...
Bumps [intro.js](https://github.com/usablica/intro.js ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/usablica/intro.js/releases )
- [Commits](https://github.com/usablica/intro.js/compare/v5.0.0...v5.1.0 )
---
updated-dependencies:
- dependency-name: intro.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-06-03 14:23:55 -04:00
266ea01bc8
build(deps): bump @vue/cli-plugin-eslint in /website/client ( #14000 )
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.5.15 to 4.5.17.
- [Release notes](https://github.com/vuejs/vue-cli/releases )
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.17/packages/@vue/cli-plugin-eslint )
---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-eslint"
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-06-03 14:23:35 -04:00
c170edae92
build(deps): bump bootstrap-vue from 2.21.2 to 2.22.0 in /website/client ( #14002 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.21.2 to 2.22.0.
- [Release notes](https://github.com/bootstrap-vue/bootstrap-vue/releases )
- [Changelog](https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.21.2...v2.22.0 )
---
updated-dependencies:
- dependency-name: bootstrap-vue
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-06-03 14:23:13 -04:00
324076438c
build(deps): bump core-js from 3.21.0 to 3.22.7 in /website/client ( #14004 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.21.0 to 3.22.7.
- [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.21.0...v3.22.7 )
---
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-06-03 14:22:30 -04:00
77791e186f
build(deps-dev): bump @babel/plugin-proposal-optional-chaining ( #14009 )
...
Bumps [@babel/plugin-proposal-optional-chaining](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-optional-chaining ) from 7.16.7 to 7.17.12.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.12/packages/babel-plugin-proposal-optional-chaining )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-optional-chaining"
dependency-type: direct:development
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-06-03 14:19:40 -04:00
b3a9e79f0d
build(deps): bump smartbanner.js in /website/client ( #14011 )
...
Bumps [smartbanner.js](https://github.com/ain/smartbanner.js ) from 1.17.0 to 1.19.0.
- [Release notes](https://github.com/ain/smartbanner.js/releases )
- [Commits](https://github.com/ain/smartbanner.js/compare/v1.17.0...v1.19.0 )
---
updated-dependencies:
- dependency-name: smartbanner.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-06-03 14:18:56 -04:00
ac972fb481
build(deps): bump eventsource from 1.1.0 to 1.1.1 in /website/client ( #14031 )
...
Bumps [eventsource](https://github.com/EventSource/eventsource ) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/EventSource/eventsource/releases )
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md )
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.1 )
---
updated-dependencies:
- dependency-name: eventsource
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-01 15:41:31 -04:00
5a0813fe7f
fix(lint): line length
2022-05-31 15:34:44 -05:00
d3673349a9
Merge branch 'release' into develop
2022-05-31 13:58:07 -05:00
e16c12fc7f
Revert "Gifting Modal Redesign ( #13964 )"
...
This reverts commit 761d70ec55
2022-05-31 10:38:14 -05:00
dd5066ab72
2022-06 Subscriber Items ( #14016 )
...
* 2022-06 Subscriber Items
* chore(mystery): compile sprites, tidy up whitespace
Co-authored-by: SabreCat <sabe@habitica.com >
2022-05-30 15:56:50 -05:00
ec0be8d91f
Adjust z-index for notifications
...
Fixes #14015
2022-05-25 11:09:43 -04:00
331c64a83a
Merge branch 'release' into develop
2022-05-24 09:38:40 -05:00
8040d14c28
code for reptacular rumble achievement ( #13981 )
2022-05-23 15:39:51 -05:00
8358da227d
fix(quests): hide offseason quests, again
...
Also tidy up some Reptacular Rumble issues
2022-05-23 15:38:16 -05:00
74b59d2324
chore(packages): lock cleanup
2022-05-23 14:59:15 -05:00
5fa705c390
code for reptacular rumble achievement
2022-05-23 14:58:17 -05:00
5bcfdbe066
fix(login): catch double-slash exploit
2022-05-20 14:29:15 -05:00
9ba0bd7c06
Keys to kennel issue ( #13978 )
...
* Fix selection highlight in avatar editor
* Fix error message on using Keys to the Kennel
2022-05-19 15:37:15 -05:00
980e35880f
fix(login): sanitize redirect
2022-05-16 15:36:09 -05:00
1a74d2b3b0
refactor(achievements): crush down to much fewer notification types
...
most work by @CuriousMagpie
2022-05-12 15:25:40 -05:00
761d70ec55
Gifting Modal Redesign ( #13964 )
...
* update selectUserModal.vue
* more updates to selectUserModal.vue, typo fix in subscriber.json
* remove exact sizing for selectUserModal.vue
* update to size for selectUserModal.vue
* added sendGiftModal.vue file
* updates to selectUser & sendGift modals
* making the modals go & position cursor
* working working working
* added a return to method
* avatar display & placeholder profile.name and username
* subscription-options added
* added menu row & started on gem options
* Added selectPage function, have not tested.
* updated habitica-images
* state changes
* bringing in gem counter
* arranging elements
* state changes, gem input boxes
* styling sendGiftModal.vue
* more sendGiftModal.vue styling and new close.svg icon
* more styling!
* and more styling of send own gems part of page
* images update
* more styling of own gems & some attempts to adjust :class on the menu
* styling styling styling
* replace +/- svg, styling
* styling, mostly
* new SVGs
* stylin'
* reverting svg changes
* no more stylin'
* finally got the +/- icons to show up...but they're the wrong color
* solved svg icon color problem! :)
* habitica-images
* working on sendGift part of button
* trying to make it do math, failing
* more attempts at math
* +/- buttons work on gem pages & cost calculation on buyGems
* trying to get hover colors working on +/- svgs
* formatted dollar amount as currency
* css/html for subscription-options & payments-buttons simplified
* swag at payments-buttons parameter (not tested)
* send gems from own balance works!
* working on starting page
* increment gem amount limited to maxGems and not < 0
* uncommented onHide()
* got bg color on sub options to work! yay!
* payment buttons!
* making g1g1 look good
* position modal on page properly & code clean-up
* Changes as requested!
* small color update
* fixed ternary function
* chore(html): indentation and comments
* fix(fn): correct catch for under-0
* chore(json): whitespace
Co-authored-by: SabreCat <sabe@habitica.com >
2022-05-12 15:14:56 -05:00
d317bd1c41
May 2022 Backgrounds and Enchanted Armoire ( #13966 )
...
* 2022-05 backgrounds and enchanted armoire images
* 2022-05 backgrounds and enchanted
* chore(sprites): compile
also fix a few string typos
Co-authored-by: SabreCat <sabe@habitica.com >
2022-05-09 14:21:25 -05:00
1a920d6e17
Hall of Heroes / Contributors: fix hasPermissions bug, merge Name and User ID columns ( #13968 )
...
* fix bug in hasPermissions call to stop normal users seeing UserID column
* merge User ID column into Name column in Hall of Heroes
2022-05-09 13:55:52 -05:00
Natalie L