5aab13b28b
Merge branch 'sabrecat/fall-2020' into release
2020-09-22 09:00:21 -05:00
caa02141b8
Merge branch 'release' into develop
2020-09-22 15:53:28 +02:00
74428d0727
fix(gem icon in menu): add hover animation
2020-09-22 15:53:05 +02:00
3aa58398b7
chore(sprites): compile
2020-09-21 14:34:45 -05:00
9450f9ee1d
feat(event): Fall Festival 2020
2020-09-21 14:34:38 -05:00
996b8f67c5
build(deps): bump sass from 1.26.10 to 1.26.11 in /website/client ( #12600 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.10 to 1.26.11.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.26.10...1.26.11 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-21 17:18:38 +02:00
b297b2a48a
build(deps): bump validator from 13.1.1 to 13.1.17 in /website/client ( #12601 )
...
Bumps [validator](https://github.com/chriso/validator.js ) from 13.1.1 to 13.1.17.
- [Release notes](https://github.com/chriso/validator.js/releases )
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/chriso/validator.js/compare/13.1.1...13.1.17 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-21 17:18:24 +02:00
74eab5bba9
Merge pull request #12603 from HabitRPG/dependabot/npm_and_yarn/website/client/bootstrap-vue-2.17.3
...
build(deps): bump bootstrap-vue from 2.17.0 to 2.17.3 in /website/client
2020-09-21 17:17:59 +02:00
87504f4d76
Merge pull request #12602 from HabitRPG/dependabot/npm_and_yarn/website/client/webpack-4.44.2
...
build(deps): bump webpack from 4.44.1 to 4.44.2 in /website/client
2020-09-21 17:17:49 +02:00
83aca20ce5
Fall Festival Gem Promo ( #138 )
...
* content: add gems blocks
* gemsBlocks: include ios and android identifiers
* wip: promo code
* split common constants into multiple files
* add second promo part
* geCurrentEvent, refactor promo
* fix lint
* fix exports, use world state api
* start adding world state tests
* remove console.log
* use gems block for purchases
* remove comments
* fix most unit tests
* restore comment
* fix lint
* prevent apple/google gift tests from breaking other tests when stub is not reset
* fix unit tests, clarify tests names
* iap: use gift object when gifting gems
* allow gift object with less data
* fix iap tests, remove findById stubs
* iap: require less data from the mobile apps
* apply discounts
* add missing worldState file
* fix lint
* add test event
* start removing 20 gems option for web
* start adding support for all gems packages on web
* fix unit tests for apple, stripe and google
* amazon: support all gems blocks
* paypal: support all gems blocks
* fix payments unit tests, add tests for getGemsBlock
* web: add gems plans with discounts, update stripe
* fix amazon and paypal clients, payments success modals
* amazon pay: disabled state
* update icons, start abstracting payments buttons
* begin redesign
* redesign gems modal
* fix buttons
* fix hover color for gems modal close icon
* add key to world state current event
* extend test event length
* implement gems modals designs
* early test fall2020
* fix header banner position
* add missing files
* use iso 8601 for dates, minor ui fixes
* fix time zones
* events: fix ISO8601 format
* fix css indentation
* start abstracting banners
* refactor payments buttons
* test spooky, fix group plans box
* implement gems promo banners, refactor banners, fixes
* fix lint
* fix dates
* remove unused i18n strings
* fix stripe integration test
* fix world state integration tests
* the current active event
* add missing unit tests
* add storybook story for payments buttons component
* fix typo
* fix(stripe): correct label when gifting subscriptions
2020-09-21 16:22:13 +02:00
cd11d4c179
build(deps): bump bootstrap-vue from 2.17.0 to 2.17.3 in /website/client
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.17.0 to 2.17.3.
- [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.17.0...v2.17.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-21 08:25:12 +00:00
e821fab4a3
build(deps): bump webpack from 4.44.1 to 4.44.2 in /website/client
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.44.1 to 4.44.2.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.44.1...v4.44.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-21 08:24:14 +00:00
81cd09d0f5
chore(news): Bailey
2020-09-17 15:33:46 -05:00
da6f275adc
Merge branch 'release' into develop
2020-09-15 14:41:25 -05:00
284d67b385
fix(sprites): mystery set
...
and Turquoise Bailey
2020-09-15 14:39:47 -05:00
78fe87055c
fix(sprites): filenam fix 2/2
2020-09-14 16:14:42 -05:00
e82d532f58
chore(sprites): compile
2020-09-14 16:06:00 -05:00
bff7d9bab3
fix(market): remove dead code
2020-09-14 12:40:08 +02:00
09622df94a
build(deps): bump @vue/cli-plugin-router in /website/client ( #12577 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.5.4 to 4.5.6.
- [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.6/packages/@vue/cli-plugin-router )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-14 12:12:17 +02:00
7d0c97ae09
build(deps): bump @vue/cli-plugin-babel in /website/client ( #12578 )
...
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.5.4 to 4.5.6.
- [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.6/packages/@vue/cli-plugin-babel )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-14 12:08:49 +02:00
ac64ad63bb
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client ( #12576 )
...
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.5.4 to 4.5.6.
- [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.6/packages/@vue/cli-plugin-unit-mocha )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-14 12:08:35 +02:00
780c2857b1
build(deps): bump bootstrap-vue from 2.16.0 to 2.17.0 in /website/client ( #12575 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.16.0 to 2.17.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.16.0...v2.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-14 12:05:36 +02:00
ca995648f4
build(deps): bump moment from 2.27.0 to 2.28.0 in /website/client ( #12579 )
...
Bumps [moment](https://github.com/moment/moment ) from 2.27.0 to 2.28.0.
- [Release notes](https://github.com/moment/moment/releases )
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/moment/moment/compare/2.27.0...2.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-14 12:05:09 +02:00
0c03093173
build(deps): bump @vue/cli-plugin-eslint in /website/client ( #12581 )
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.5.4 to 4.5.6.
- [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.6/packages/@vue/cli-plugin-eslint )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-14 12:04:58 +02:00
4183cfb8a0
build(deps): bump @vue/cli-service in /website/client ( #12582 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.5.4 to 4.5.6.
- [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.6/packages/@vue/cli-service )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-14 12:04:46 +02:00
0837d17616
fix(client): use correct interpolation format for strings
2020-09-12 19:08:42 +02:00
52667661c6
fix(overview): use correct indentation
2020-09-12 17:25:16 +02:00
9adf5160fe
Merge branch 'release' into develop
2020-09-11 12:56:23 -05:00
953c84260f
fix(tasks and groupd): do not apply default due filter to challenges, fix edge case in group loading
2020-09-11 19:53:28 +02:00
c133445ff6
Fixed Privacy Policy anchor tag target attribute ( #12554 )
...
* Fixed Privacy Policy and terms anchor tag target attribute from blanck to blank
* Fixed one more Privacy Policy anchor tag target attribute from blanck to blank
2020-09-11 12:32:59 +02:00
5716b4eb72
Frontend support and adjustments of current banned words blocking code to support new implementation ( Fixes #12405 ) ( #12496 )
...
* Added the "Allow banned words" checkbox to create/update guild forms
Added the "Allow banned words" checkbox to guild create/update forms which are only visible to Admins
* Updated create/update group API to include bannedWordsAllowed property
Added logic to set bannedWordsAllowed depending on conditions
* Updated word banning logic to use bannedWordsAllowed guild value instead
Updated word banning logic to use bannedWordsAllowed guild value and deleted hardcoded guild file & import
* Updated banned words test
* Pull Request amends
Removed the setting of bannedWordsAllowed during group creation
Added v-once to elements
Updated existing test and added tests related to bannedWordsAllowed functionality
* Small amend
* Small amend
Removed leftover code that was left during testing
2020-09-11 10:29:30 +02:00
83ec53c614
Merge branch 'develop' into release
2020-09-10 15:06:51 -05:00
5fa140376e
fix(sprites): pixel scoot
2020-09-10 09:33:47 -05:00
d7cc317208
Merge branch 'release' into develop
2020-09-08 16:11:29 -05:00
eec57cb9b8
chore(sprites): compile
2020-09-08 16:10:17 -05:00
96d22e54f8
fix(task creation): correctly clone selected tags array, fixes #12447
2020-09-08 12:52:09 +02:00
78016c0aeb
fix(modals): apply base styles everywhere, fixes #12524
2020-09-07 21:24:58 +02:00
b0786647ed
Bugfix challenge tags to normal tags after a challenge has ended/deleted ( #12341 )
...
* Fix bug in challenge tags not converted to normal tags after challenge ended/deleted
* Added test cases to test bug fix
* Set tag.challenge from String to Boolean in tag model schema
* Update existing test with tag challenge set to boolean instead of string
* Added migration file for converting tag challenge field from string to bool
* Implement suggestions from ilnt
* Use mongoose instead of Mock in migration
* Change from update to bulkwrite
* update users individually
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-09-07 16:48:22 +02:00
1b25d30ac6
Correctly filter tasks in challenges and remove filters where unhelpful ( #12522 )
...
* Correctly filter tasks in challenges and remove filters where unhelpful
* update isDue property on the client as soon as challenges are created or edited
* change method of update for task on receiving data
* try different assign method
* fix lint
* fix issue with data reactivity
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-09-07 16:11:28 +02:00
362677acb8
fix(checklists): correctly hide original input in disabled state, fixes #12528
2020-09-07 15:42:04 +02:00
49bfe386a6
build(deps): [security] bump serialize-javascript in /website/client ( #12542 )
...
Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript ) from 3.0.0 to 3.1.0. **This update includes a security fix.**
- [Release notes](https://github.com/yahoo/serialize-javascript/releases )
- [Commits](https://github.com/yahoo/serialize-javascript/compare/v3.0.0...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-07 11:53:32 +02:00
f9ed36a9f2
build(deps): bump habitica-markdown in /website/client ( #12545 )
...
Bumps [habitica-markdown](https://github.com/HabitRPG/habitica-markdown ) from 2.0.2 to 3.0.0.
- [Release notes](https://github.com/HabitRPG/habitica-markdown/releases )
- [Commits](https://github.com/HabitRPG/habitica-markdown/compare/v2.0.2...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-07 11:52:29 +02:00
e965f6a28f
Merge branch 'release' into develop
2020-09-05 13:10:57 +02:00
a91c2f7c7c
fix(settings): revert axios version due to account delete issue
2020-09-04 17:30:46 -05:00
5122d137b0
Change spellRogueStealthMaxedOut and spellAlreadyCast to a clearer wo… ( #12497 )
...
* Change spellRogueStealthMaxedOut and spellAlreadyCast to a clearer wording
* Restore package-lock.json and Delete string spellRogueStealthMaxedOut
* remove unused string, restore package-lock.json changes
* restore client package-lock.json
* Change spellRogueStealthMaxedOut and spellAlreadyCast to a clearer wording
* Restore package-lock.json and Delete string spellRogueStealthMaxedOut
* remove unused string, restore package-lock.json changes
* restore client package-lock.json
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-09-04 12:21:50 +02:00
0c3b16ca74
fix(task modal): make sure task is loaded when template is shown
2020-09-03 16:33:44 +02:00
01ae56f944
Merge branch 'release' into develop
2020-09-01 11:10:26 -05:00
ca413ff41a
chore(sprites): compile
2020-09-01 11:08:50 -05:00
f1469b52f6
hotfix datepicker size
2020-08-31 23:13:31 +02:00
ef118f23c2
fix(loading): do not shift loading screen
2020-08-31 16:54:31 +02:00
Sabe Jones