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
32e9dbe1ed
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client ( #12513 )
...
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.5.3 to 4.5.4.
- [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.4/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-08-31 13:25:28 +02:00
466fb4e42e
build(deps): bump axios from 0.19.2 to 0.20.0 in /website/client ( #12516 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.2 to 0.20.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.19.2...v0.20.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-08-31 13:24:47 +02:00
3bb8db45fd
build(deps): bump @vue/cli-plugin-eslint in /website/client ( #12510 )
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.5.3 to 4.5.4.
- [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.4/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-08-31 13:22:56 +02:00
181317dbff
build(deps): bump @vue/cli-plugin-eslint in /website/client
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.5.3 to 4.5.4.
- [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.4/packages/@vue/cli-plugin-eslint )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-31 11:22:44 +00:00
73a7ef8b2c
build(deps): bump vue and vue-template-compiler in /website/client ( #12511 )
...
Bumps [vue](https://github.com/vuejs/vue ) and [vue-template-compiler](https://github.com/vuejs/vue ). These dependencies needed to be updated together.
Updates `vue` from 2.6.11 to 2.6.12
- [Release notes](https://github.com/vuejs/vue/releases )
- [Commits](https://github.com/vuejs/vue/compare/v2.6.11...v2.6.12 )
Updates `vue-template-compiler` from 2.6.11 to 2.6.12
- [Release notes](https://github.com/vuejs/vue/releases )
- [Commits](https://github.com/vuejs/vue/compare/v2.6.11...v2.6.12 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-31 13:21:15 +02:00
206e3468f4
build(deps): bump vuedraggable from 2.24.0 to 2.24.1 in /website/client ( #12520 )
...
Bumps [vuedraggable](https://github.com/SortableJS/Vue.Draggable ) from 2.24.0 to 2.24.1.
- [Release notes](https://github.com/SortableJS/Vue.Draggable/releases )
- [Commits](https://github.com/SortableJS/Vue.Draggable/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-31 13:17:49 +02:00
77fde9d73f
build(deps): bump amplitude-js from 7.1.0 to 7.1.1 in /website/client ( #12517 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases )
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/master/CHANGELOG.md )
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v7.1.0...v7.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-31 13:17:25 +02:00
c1d4bcbac3
build(deps): bump @vue/cli-service in /website/client ( #12514 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.5.3 to 4.5.4.
- [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.4/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-08-31 13:17:05 +02:00
e98d0d88d9
build(deps): bump @storybook/addon-notes in /website/client ( #12512 )
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.19 to 5.3.21.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.21/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.21/addons/notes )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-31 13:16:39 +02:00
fc3a1dd93d
build(deps): bump @vue/cli-plugin-router in /website/client ( #12509 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.5.3 to 4.5.4.
- [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.4/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-08-31 13:16:07 +02:00
897155e4c8
build(deps): bump @vue/cli-plugin-babel in /website/client ( #12506 )
...
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.5.3 to 4.5.4.
- [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.4/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-08-31 13:15:55 +02:00
aa1ea74daa
datepicker: add clear button ( #12480 )
...
* datepicker: add clear button
* use close icon instead of "x" as text
2020-08-29 17:22:31 +02:00
1b301e9c68
issue(11266) - Restyle level-up modal with sparkles ( #12486 )
...
* issue(11266) - Restyle level-up modal with sparkles
* issue(11266) - Add reward display to level up modal
At levels 15, 30, 40 and 60 the earned quests are now shown in the level-up modal.
* issue(11266) - Simplify css and don't use custom footer
* issue(11266) - Don't show pink bars and use colour variables
2020-08-29 16:33:06 +02:00
c00b2247d4
fix #12498 : do not score task when using a skill
2020-08-29 16:23:32 +02:00
7eeddcb033
Merge branch 'release' into develop
2020-08-25 16:05:40 -05:00
80ffcddb35
chore(sprites): compile
2020-08-25 16:04:35 -05:00
f4c453675b
feat(content): Wind-Up Potions quest
2020-08-25 16:04:28 -05:00
5165d491b0
fix some lint warnings ( #12488 )
...
* prevent some lint warnings by turning off some rules we don't seem to care about
require-prop-types has 167 violations
require-default-prop has 93 violations
* fix some lint warnings by adding eslint-disable-line comments
* prevent lint warnings by moving vue hooks to a different order
* apply some automatic lint fixes
* fix lint error by making line shorter
* prevent lint warnings from whitespace and @input, @click positioning
* revert 723fa38271
2020-08-25 18:06:39 +02:00
9caacc8f6c
fix(links): restore styles changed in bootstrap@4.5.1
2020-08-25 16:17:12 +02:00
dependabot-preview[bot]