2372efa22e
Merge branch 'release' into develop
2022-10-30 19:54:18 -05:00
b5c950ac96
chore(content): add November 2022 Mystery Items ( #14317 )
...
* chore(content): add November Mystery Items
* chore: merge release into 2022-11-mystery-items
* Revert "chore: merge release into 2022-11-mystery-items"
This reverts commit e12b61d73fsabe@habitica.com >
2022-10-30 19:52:55 -05:00
0f3bc980d9
build(deps): bump smartbanner.js in /website/client ( #14313 )
...
Bumps [smartbanner.js](https://github.com/ain/smartbanner.js ) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/ain/smartbanner.js/releases )
- [Commits](https://github.com/ain/smartbanner.js/compare/v1.19.0...v1.19.1 )
---
updated-dependencies:
- dependency-name: smartbanner.js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-28 11:22:40 -04:00
7f87120d34
build(deps): bump core-js from 3.25.5 to 3.26.0 in /website/client ( #14314 )
...
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.25.5 to 3.26.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/commits/v3.26.0/packages/core-js )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-28 11:22:19 -04:00
0b2cf5bceb
Fixes issue #14175 - Consolidate Challenge category options list to common file ( #14201 )
...
* Issue #14175 - Created a categoryOptions.js file in website/common/script/content to store list of category Options. Imported and added the list to website/client/src/components : challenges/challengeModal, challenges/sidebar, groups/groupFormModal, and groups/groupSidebar. This replaced the statically typed lists that previously existed. Tested the challengeModal and sidebar but unable to test the groups files due to credit card requirements. -@Tundrian
* Issue #14175 - Created a categoryOptions.js file in website/common/script/content to store list of category Options. Imported and added the list to website/client/src/components : challenges/challengeModal, challenges/sidebar, groups/groupFormModal, and groups/groupSidebar. This replaced the statically typed lists that previously existed. Tested the challengeModal and sidebar but unable to test the groups files due to credit card requirements. -@Tundrian
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-12 15:46:36 -05:00
f43a0d8289
Add checkmark to completed quests in shop ( #14269 )
...
* add 'completed' property to quest items
* show checkmark on completed quests in the shop
* add 'completed' property to quest items
* show checkmark on completed quests in the shop
2022-10-12 15:44:22 -05:00
39be8db4f9
build(deps): bump axios from 0.25.0 to 0.27.2 in /website/client ( #14007 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.25.0 to 0.27.2.
- [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.25.0...v0.27.2 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 17:34:16 -05:00
f0a1f11a16
Merge branch 'release' into develop
2022-10-11 17:32:25 -05:00
84c4b3536c
build(deps): bump minimist, minimist and mkdirp in /website/client ( #14286 )
...
Bumps [minimist](https://github.com/minimistjs/minimist ), [minimist](https://github.com/minimistjs/minimist ) and [mkdirp](https://github.com/isaacs/node-mkdirp ). These dependencies needed to be updated together.
Updates `minimist` from 1.2.5 to 1.2.7
- [Release notes](https://github.com/minimistjs/minimist/releases )
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md )
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7 )
Updates `minimist` from 1.2.0 to 1.2.7
- [Release notes](https://github.com/minimistjs/minimist/releases )
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md )
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7 )
Updates `mkdirp` from 0.5.1 to 0.5.6
- [Release notes](https://github.com/isaacs/node-mkdirp/releases )
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/main/CHANGELOG.md )
- [Commits](https://github.com/isaacs/node-mkdirp/compare/0.5.1...v0.5.6 )
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
- dependency-name: minimist
dependency-type: indirect
- dependency-name: mkdirp
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 15:53:10 -05:00
cf834f57d7
build(deps): bump ansi-html and webpack-dev-server in /website/client ( #14285 )
...
Removes [ansi-html](https://github.com/Tjatse/ansi-html ). It's no longer used after updating ancestor dependency [webpack-dev-server](https://github.com/webpack/webpack-dev-server ). These dependencies need to be updated together.
Removes `ansi-html`
Updates `webpack-dev-server` from 3.11.2 to 3.11.3
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.3/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.2...v3.11.3 )
---
updated-dependencies:
- dependency-name: ansi-html
dependency-type: indirect
- dependency-name: webpack-dev-server
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 15:40:45 -05:00
0ec7784fb1
build(deps): bump @vue/cli-plugin-router in /website/client ( #14121 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.5.15 to 5.0.8.
- [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/v5.0.8/packages/@vue/cli-plugin-router )
---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-router"
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:59:32 -05:00
37791dfe8d
build(deps): bump intro.js from 5.1.0 to 6.0.0 in /website/client ( #14122 )
...
Bumps [intro.js](https://github.com/usablica/intro.js ) from 5.1.0 to 6.0.0.
- [Release notes](https://github.com/usablica/intro.js/releases )
- [Commits](https://github.com/usablica/intro.js/compare/v5.1.0...v6.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 >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:56:22 -05:00
cc39f6e4e9
build(deps): bump vue-router from 3.5.4 to 3.6.5 in /website/client ( #14228 )
...
Bumps [vue-router](https://github.com/vuejs/router ) from 3.5.4 to 3.6.5.
- [Release notes](https://github.com/vuejs/router/releases )
- [Commits](https://github.com/vuejs/router/commits )
---
updated-dependencies:
- dependency-name: vue-router
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:55:11 -05:00
452b516c67
build(deps): bump amplitude-js from 8.21.0 to 8.21.1 in /website/client ( #14248 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.21.0 to 8.21.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.21.0...v8.21.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 >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:53:17 -05:00
e75610447f
build(deps): bump @hapi/hoek from 8.3.1 to 8.5.1 in /website/client ( #14255 )
...
Bumps [@hapi/hoek](https://github.com/hapijs/hoek ) from 8.3.1 to 8.5.1.
- [Release notes](https://github.com/hapijs/hoek/releases )
- [Commits](https://github.com/hapijs/hoek/compare/v8.3.1...v8.5.1 )
---
updated-dependencies:
- dependency-name: "@hapi/hoek"
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:51:37 -05:00
9d4f70371d
build(deps): bump core-js from 3.24.1 to 3.25.5 in /website/client ( #14282 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.24.1 to 3.25.5.
- [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.24.1...v3.25.5 )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:42:22 -05:00
18534a21ff
Merge branch 'develop' into release
2022-10-11 11:59:02 -05:00
4d1bbdd8d0
chore(content): add October Backgrounds and Enchanted Armoire Items ( #14266 )
...
* chore(content): add October Backgrounds and Enchanted Armoire Items
* fix(typo): fix a couple of descriptions
* chore(subproject): update images
* fix(typo): keepin our caps consistent
* fix(typo): whitespace, caps
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-10-11 11:54:24 -05:00
3f9d55254e
fix(style): update to scoped colors & set footer background image to pointer-events:none ( #14265 )
...
* 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
2022-10-07 16:10:29 -05:00
ace964f2b3
fix(subs): escape group demographics without group
2022-10-06 15:53:19 -05:00
57d3fea523
Merge branch 'group-tracking-modal' into release
2022-09-30 14:47:08 -05:00
7db093d2bb
Merge branch 'sabrecat/panel-subscription' into release
2022-09-30 14:46:10 -05:00
06d2ffb37d
Merge branch 'sabrecat/gems-multi-event' into release
2022-09-30 14:45:36 -05:00
4c4d0be31f
fix(analytics): include client tracking parameter
2022-09-29 15:07:21 -05:00
a08ecbe044
chore(content): add October 2022 Mystery Items ( #14254 )
2022-09-28 15:04:47 -05:00
535fddf92d
feat(sale): add fine print
2022-09-21 16:28:15 -05:00
4c988691cf
fix(groups): show group task summary modal for site admins
...
also change "Watcher" to "Peeker" in fall healer gear
2022-09-21 14:39:46 -05:00
9890e0079a
fix: correct groupPlan.vue file
2022-09-21 12:02:35 -04:00
1530ab44e9
fix(gala): hide avatar customizations before start date
2022-09-20 16:57:39 -05:00
004f1ee2dc
Merge branch 'develop' into sabrecat/panel-subscription
2022-09-20 15:11:29 -05:00
c61bdaf563
Merge remote-tracking branch 'origin/group-tracking-modal' into group-tracking-modal
2022-09-20 15:36:58 -04:00
85e14bb100
Merge branch 'develop' into group-tracking-modal
2022-09-20 14:13:59 -05:00
8e9b469d8d
chore: merge develop
2022-09-20 13:11:43 -04:00
f030135c82
chore(content): add 2022 Fall Festival ( #14244 )
...
* chore(submodule): add August 2022 Mystery Items
* update(content): add 2022 Fall Festival content
* update(content): add 2022 Fall Festival content
* update(content): update event dates for release
* fix(lint): remove extra spaces
also correct typo in gear string keys
* feat(content): remaining descriptions
* fix(event): correct spell availability
* fix(test): work around first-match logic
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2022-09-19 16:55:53 -05:00
2c29310466
chore(privacy): official update note
2022-09-19 16:19:20 -05:00
13eef6e4cf
chore: merge develop
2022-09-19 15:10:11 -04:00
9ba4687478
build(deps): bump amplitude-js from 8.18.5 to 8.21.0 in /website/client ( #14223 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.18.5 to 8.21.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.18.5...v8.21.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 >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-19 14:30:19 -04:00
4702479156
build(deps): bump vue and vue-template-compiler in /website/client ( #14196 )
...
Bumps [vue](https://github.com/vuejs/core ) and [vue-template-compiler](https://github.com/vuejs/vue ). These dependencies needed to be updated together.
Updates `vue` from 2.7.8 to 2.7.10
- [Release notes](https://github.com/vuejs/core/releases )
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md )
- [Commits](https://github.com/vuejs/core/commits )
Updates `vue-template-compiler` from 2.7.8 to 2.7.10
- [Release notes](https://github.com/vuejs/vue/releases )
- [Changelog](https://github.com/vuejs/vue/blob/main/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue/compare/v2.7.8...v2.7.10 )
---
updated-dependencies:
- dependency-name: vue
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: vue-template-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-19 14:26:17 -04:00
b384cd4eb8
build(deps): bump dompurify from 2.3.10 to 2.4.0 in /website/client ( #14191 )
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 2.3.10 to 2.4.0.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/2.3.10...2.4.0 )
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-19 14:25:24 -04:00
d2bd7dc325
build(deps): bump jquery from 3.6.0 to 3.6.1 in /website/client ( #14190 )
...
Bumps [jquery](https://github.com/jquery/jquery ) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.6.0...3.6.1 )
---
updated-dependencies:
- dependency-name: jquery
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-19 14:24:01 -04:00
719fab8d4b
chore: merge develop in
2022-09-16 16:12:34 -04:00
24841346dc
Purge Facebook ( #13696 )
...
* 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 c244b1651c7e0069a80fsabe@habitica.com >
2022-09-15 18:22:52 -05:00
9a896470d5
Site Footer Update ( #14134 )
...
* 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
2022-09-14 16:35:24 -05:00
6b0b393e32
fix: Group Plans string duplication & style adjustment ( #14148 )
...
* 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 >
2022-09-14 16:33:31 -05:00
fb780c9a2d
fix(admin): reactivity with subscriptions
2022-09-13 15:52:03 -05:00
21185b689c
update: add 'type' to amazonModal.vue, removed extraneous analytics.js code
2022-09-12 11:42:39 -04:00
5a85e0730c
update: analytics debugging
2022-09-09 16:56:19 -04:00
771558e1fd
update: analytics debugging
2022-09-09 16:27:25 -04:00
e6f903fd2e
update: more analytics work
2022-09-09 15:37:08 -04:00
5c13bf1980
update: add analytics to create and success modals
2022-09-08 17:34:36 -04:00
SabreCat