1e021fa1d8
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client ( #13245 )
...
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.5.11 to 4.5.12.
- [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.12/packages/@vue/cli-plugin-unit-mocha )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-06 15:43:13 -05:00
0ec077f697
build(deps): bump sass from 1.32.11 to 1.32.12 in /website/client ( #13246 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.11 to 1.32.12.
- [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.32.11...1.32.12 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-06 15:42:59 -05:00
833e2b195d
Revert " #12781 Add a unified component for small modals ( #12987 )"
...
This reverts commit 591c9bc98c
2021-05-06 14:18:31 -05:00
454e72eab7
Merge branch 'release' into develop
2021-05-04 16:21:22 -05:00
18edb6e6f4
chore(sprites): compile
2021-05-04 16:20:41 -05:00
f33720e9fd
Drag challenge tasks ( #12204 )
...
* Allow challenge tasks to be draggable by leaders and admins
* Drag challenge tasks, ensure they're ordered
* Ensure group tasks are ordered properly, make draggable
* Add tests, fix broken tests
* Resolve merge conflict
* Remove console.log()
* Address code review comments
* Code review fixes
* Fix lint
* Fix importing
* taskManager
* Lint
* Fix collapseChecklist test
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2021-04-30 16:23:27 -05:00
4d7304ab8d
created a variable that stores yesterDay's utcoffset ( #12860 )
...
passed this variable in shouldDo function call as timezoneUtcoffset
shouldDo takes timezoneUtcoffset into account when running yesterday's dailies, which fixes DST mismatch issues
2021-04-30 15:21:43 -05:00
3d7d7e034f
Challenge tags can be sorted, Partial fix for #10934 ( #13225 )
...
* Fixes #10934 , Challenges can be sorted
* revert all buttons to 'Edit Tags'
* change 'role' options and filters to 'membership'
* added membership filtering function to discover challenges
* fix accidental deletion
* Revert "change 'role' options and filters to 'membership'"
This reverts commit b81f9087bb4cd5a4cb4e55025cf602lizap@umich.edu >
2021-04-30 15:13:31 -05:00
28ce27d5f5
babel: enable optional chaining ( #13222 )
...
* babel: enable optional chaining
* fix lint
2021-04-30 15:02:30 -05:00
92beff46b6
Various Chat Fixes - Fixes #12377 ( #13180 )
...
* Various Chat Fixes
* Allow adding `@mention` anywhere (previously was fixed at the end of the text)
* Add re-focus after mouseclick on `@mention` choice
* Remove`@mention` space barrier (since server ingests mentions without spaces in between)
Co-authored-by: Bart Enkelaar <benkelaar@gmail.com >
* Boundry Search + Select shutoff
Co-authored-by: Bart Enkelaar <benkelaar@gmail.com >
2021-04-29 16:06:16 -05:00
591c9bc98c
#12781 Add a unified component for small modals ( #12987 )
...
* 12781 - Add common component for small modal windows
* 12781 - Fix drop cap layout and hide footer
* 12781 - Implement drop cap reached and won challenge modals
* 12781 - Couple small fixes
* 12781 - Remove added drop cap modal test convenience
* Less assumptions in small-modal component
* 12781 - Fix already migrated small modals
* Figured out how to properly test Bootstrap modals
* 12781 - Add unit test for success modal
* 12781 - Some more steps towards integrating successModal.vue
* 12781 - Use small modal mixin in success modal
* 12781 - Optimize templating in successModal
* 12781 - Revert AppFooter additions
* 12781 - Add test case and remove unnecessary method
2021-04-29 15:18:58 -05:00
5479c76f08
Fixes #12966 pass the group to groupChallenges so the leader only check can be used to display the create challenge button ( #13221 )
...
Co-authored-by: SpeedyLom <speedylomuk@gmail.com >
2021-04-29 15:08:53 -05:00
fea39e7c9b
over-purchase warning for Gryphon eggs now ignore Royal Purple pets a… ( #13121 )
...
* over-purchase warning for Gryphon eggs now ignore Royal Purple pets and mounts
* fixed casing with potion name
2021-04-29 14:18:13 -05:00
6d28029a5f
Clientside: Block low lvl for high lvl spells - Fixes #12904 ( #13135 )
...
* Add lvl block on high lvl spell, add i18n for not enough gold/lvl for spell.
Add space for invalidClass because of simple lint
* Wrap i18n in the msgbox funcion
* Remove trailing whitespace (as seen in a comment weblate)
* Block level first
Change blocking order so that the spell is prevented based on lvl, then mana, then gold
* Strip notEnoughLvl pop-up error (and i18n):
Button is already visually distinguishable
* fix lint (mv comment, return null)
2021-04-29 14:10:10 -05:00
40fd977a0e
build(deps): bump svg-url-loader from 6.0.0 to 7.1.1 in /website/client ( #12831 )
...
Bumps [svg-url-loader](https://github.com/bhovhannes/svg-url-loader ) from 6.0.0 to 7.1.1.
- [Release notes](https://github.com/bhovhannes/svg-url-loader/releases )
- [Commits](https://github.com/bhovhannes/svg-url-loader/compare/v6.0.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>
2021-04-28 17:29:53 -05:00
99e6e381cf
build(deps): bump nconf from 0.11.1 to 0.11.2 in /website/client ( #13018 )
...
Bumps [nconf](https://github.com/flatiron/nconf ) from 0.11.1 to 0.11.2.
- [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.1...v0.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 17:28:37 -05:00
7e05d1ee53
build(deps): bump vue-router from 3.4.9 to 3.5.1 in /website/client ( #13019 )
...
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.4.9 to 3.5.1.
- [Release notes](https://github.com/vuejs/vue-router/releases )
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-router/compare/v3.4.9...v3.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 17:27:48 -05:00
64f94e9ebe
build(deps): bump lodash from 4.17.20 to 4.17.21 in /website/client ( #13067 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 17:26:45 -05:00
f4934abc62
style: Align Hide Locked Backgrounds to center ( #13176 )
2021-04-28 16:29:13 -05:00
4dc718fbff
L10N boss num ( #13178 )
...
* Uses browser JS `toLocaleString` to convert numbers to appropriately "marked" numbers
* Add filter for localizeNumber (suggestion from benkelaar)
Co-authored-by: Bart Enkelaar <benkelaar@gmail.com >
Co-authored-by: Bart Enkelaar <benkelaar@gmail.com >
2021-04-28 16:15:40 -05:00
056f4926f5
selList overflow ( #13179 )
...
* Limit `membersModal` list selector to 12-unit grid (to prevent wrap around on long text for `sortOptions`)
* Add ellipse based overflow for `membersModal` list selector
* Add padding so that the checkmark for `membersModal` list doesn't overlap with text
* Use scss with v-deep properly (also pretty checkmark to "full-width" of checkmark)
2021-04-28 16:07:07 -05:00
0bd737469a
chore(deps): bump core-js from 3.11.0 to 3.11.1 in /website/client ( #13209 )
...
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.11.0 to 3.11.1.
- [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.11.1/packages/core-js )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-28 15:39:39 -05:00
c8bb9ed5b3
build(deps): [security] bump elliptic in /website/client ( #13105 )
...
Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.3 to 6.5.4. **This update includes a security fix.**
- [Release notes](https://github.com/indutny/elliptic/releases )
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 15:12:19 -05:00
c2f0b527a6
build(deps): bump chai from 4.2.0 to 4.3.4 in /website/client ( #13120 )
...
Bumps [chai](https://github.com/chaijs/chai ) from 4.2.0 to 4.3.4.
- [Release notes](https://github.com/chaijs/chai/releases )
- [Changelog](https://github.com/chaijs/chai/blob/main/History.md )
- [Commits](https://github.com/chaijs/chai/compare/4.2.0...v4.3.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 15:11:28 -05:00
8b948ff593
build(deps): bump amplitude-js from 7.4.1 to 8.1.0 in /website/client ( #13130 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 7.4.1 to 8.1.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/v7.4.1...v8.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>
2021-04-28 15:10:34 -05:00
c02fc4990c
build(deps): bump @vue/cli-service in /website/client ( #13134 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.5.11 to 4.5.12.
- [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.12/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>
2021-04-28 15:09:38 -05:00
5717f4cff8
build(deps): bump @vue/cli-plugin-router in /website/client ( #13133 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.5.11 to 4.5.12.
- [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.12/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>
2021-04-28 15:09:22 -05:00
54b54c42e4
build(deps): bump intro.js from 2.9.3 to 3.4.0 in /website/client ( #13145 )
...
Bumps [intro.js](https://github.com/usablica/intro.js ) from 2.9.3 to 3.4.0.
- [Release notes](https://github.com/usablica/intro.js/releases )
- [Commits](https://github.com/usablica/intro.js/compare/v2.9.3...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 15:07:52 -05:00
3656162923
chore(deps): [security] bump ssri from 6.0.1 to 6.0.2 in /website/client ( #13177 )
...
Bumps [ssri](https://github.com/npm/ssri ) from 6.0.1 to 6.0.2. **This update includes a security fix.**
- [Release notes](https://github.com/npm/ssri/releases )
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md )
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 15:01:22 -05:00
06955ed7bd
chore(deps): [security] bump y18n from 4.0.0 to 4.0.3 in /website/client ( #13182 )
...
Bumps [y18n](https://github.com/yargs/y18n ) from 4.0.0 to 4.0.3. **This update includes a security fix.**
- [Release notes](https://github.com/yargs/y18n/releases )
- [Changelog](https://github.com/yargs/y18n/blob/y18n-v4.0.3/CHANGELOG.md )
- [Commits](https://github.com/yargs/y18n/compare/v4.0.0...y18n-v4.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 15:00:07 -05:00
cc2eff33d0
chore(deps): bump @storybook/addon-actions in /website/client ( #13199 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 6.1.15 to 6.2.9.
- [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.2.9/addons/actions )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 14:49:57 -05:00
66e033b245
chore(deps): bump @storybook/addon-links in /website/client ( #13203 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 6.1.15 to 6.2.9.
- [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.2.9/addons/links )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-28 14:49:30 -05:00
7dfbd1cf07
Merge branch 'release' into develop
2021-04-28 14:35:28 -05:00
6f7e1ff326
chore(sprites): compile
2021-04-28 14:33:55 -05:00
8e15c6b482
chore(deps): bump sass from 1.32.5 to 1.32.11 in /website/client ( #13197 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.5 to 1.32.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.32.5...1.32.11 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-26 16:41:33 -05:00
7c70687470
chore(deps): bump core-js from 3.8.3 to 3.11.0 in /website/client ( #13198 )
...
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.8.3 to 3.11.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.11.0/packages/core-js )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-26 16:41:08 -05:00
34494823e1
chore(deps): bump validator from 13.5.2 to 13.6.0 in /website/client ( #13200 )
...
Bumps [validator](https://github.com/validatorjs/validator.js ) from 13.5.2 to 13.6.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases )
- [Changelog](https://github.com/validatorjs/validator.js/blob/13.6.0/CHANGELOG.md )
- [Commits](https://github.com/validatorjs/validator.js/compare/13.5.2...13.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-26 16:39:59 -05:00
897f2a0da0
chore(deps): bump hellojs from 1.18.6 to 1.19.3 in /website/client ( #13201 )
...
Bumps [hellojs](https://github.com/MrSwitch/hello.js ) from 1.18.6 to 1.19.3.
- [Release notes](https://github.com/MrSwitch/hello.js/releases )
- [Changelog](https://github.com/MrSwitch/hello.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.18.6...v1.19.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-26 16:38:17 -05:00
2769cce482
chore(deps): bump @storybook/vue from 6.1.15 to 6.2.9 in /website/client ( #13204 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 6.1.15 to 6.2.9.
- [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.2.9/app/vue )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-26 16:37:26 -05:00
7b4b4240cb
Merge branch 'release' into develop
2021-04-16 11:13:19 -05:00
affa33868a
Merge branch 'sabrecat/banner-dates' into release
2021-04-16 11:12:41 -05:00
9c402152e8
feat(event): Shiny Seed and Egg Hunt countdowns
2021-04-08 16:26:32 -05:00
23f6e9b911
feat(event): more datetime countdown improvements
2021-04-08 15:43:47 -05:00
51e8aa341d
Merge branch 'release' into develop
2021-04-07 14:51:47 -05:00
2c5accd5b2
fix(event): correct event data for Birch Potion
...
also adjust placement of clown nose
2021-04-07 14:49:48 -05:00
cdaa504db4
feat(event): countdown banners for limited availability items
2021-04-07 12:24:24 -05:00
548593dfb2
Merge branch 'release' into develop
2021-04-06 17:11:17 -05:00
2e246dad28
chore(sprites): compile
2021-04-06 17:09:43 -05:00
48892a0af3
chore(packages): update Bootstrap
2021-04-05 15:39:33 -05:00
92be66d9ac
Merge branch 'release' into develop
2021-03-30 15:20:28 -05:00
dependabot[bot]