4482b734a5
build(deps): bump @vue/cli-plugin-router in /website/client ( #12056 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:30:38 +02:00
0131cc07bf
build(deps): bump @vue/cli-service in /website/client ( #12051 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:30:26 +02:00
70a9f66dcd
build(deps): bump @vue/cli-plugin-babel in /website/client ( #12049 )
...
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:30:10 +02:00
3057fdbd4a
build(deps): bump @storybook/addon-links in /website/client ( #12047 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 5.3.17 to 5.3.18.
- [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/v5.3.18/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>
2020-04-06 11:01:56 +02:00
f4e573f684
build(deps): bump bootstrap-vue from 2.9.0 to 2.10.1 in /website/client ( #12050 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.9.0 to 2.10.1.
- [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.9.0...v2.10.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-04-06 10:53:56 +02:00
a2e59d0920
build(deps): bump @storybook/addon-knobs in /website/client ( #12048 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs ) from 5.3.17 to 5.3.18.
- [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/v5.3.18/addons/knobs )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-06 10:53:48 +02:00
39fe86c688
build(deps): bump @storybook/addon-notes in /website/client ( #12046 )
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.17 to 5.3.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.18/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.18/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-04-06 10:53:38 +02:00
78ceb427a3
build(deps): bump @storybook/addon-actions in /website/client ( #12052 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 5.3.17 to 5.3.18.
- [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/v5.3.18/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>
2020-04-06 10:50:15 +02:00
7c17a32bbb
build(deps): bump @storybook/vue in /website/client ( #12057 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 5.3.17 to 5.3.18.
- [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/v5.3.18/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>
2020-04-06 10:49:52 +02:00
156d15c540
Merge remote-tracking branch 'upstream/develop' into ptsFix
2020-04-04 16:29:34 +11:00
7d9b8a5ceb
use bootstrap native style rather than custom
2020-04-04 16:28:10 +11:00
23b19853b4
fix(image): filename
2020-04-03 20:36:31 -05:00
167f4f07b8
feat(content): Confection Pets
2020-04-03 19:25:43 -05:00
931d8814b6
chore(sprites): compile
2020-04-03 15:41:49 -05:00
a2c91aae70
chore(news): Challenge and Blog Bailey
2020-04-02 16:09:36 -05:00
3ac69d5e75
Merge branch 'develop' into release
2020-04-02 15:09:54 -05:00
87b26c4cfb
chore(event): end Foolishness
2020-04-02 15:09:30 -05:00
e92ff9737a
Automatically Logout Banned Users ( #12037 )
...
* wip
* logout banned users, fix and refactor language library and middleware
* req.locals -> res.locals
* fix tests
* redirect to login page
2020-04-02 21:46:01 +02:00
11235685ca
fix(avatar): adjust expected padding for always-on pets
2020-04-01 06:51:14 -05:00
49d6691f7d
fix(avatar): adjust expected padding for always-on pets
2020-04-01 06:51:02 -05:00
56b1f6371f
Merge branch 'release' into develop
2020-04-01 06:32:15 -05:00
e39eafd3f0
feat(event): April Foolin
2020-04-01 06:31:39 -05:00
7e9d3062f3
fix(achievements modal): fixes hide achievements button formatting ( #12013 )
2020-03-31 16:11:37 +02:00
84ad270436
Merge branch 'release' into develop
2020-03-30 16:14:17 -05:00
5f97cb31b8
chore(sprites): compile
2020-03-30 16:12:11 -05:00
a08b419411
build(deps): bump webpack from 4.42.0 to 4.42.1 in /website/client ( #12029 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.42.0 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.42.0...v4.42.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-03-30 10:29:18 +02:00
d35fd9d90d
build(deps): bump bootstrap-vue from 2.8.0 to 2.9.0 in /website/client ( #12027 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.8.0 to 2.9.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.8.0...v2.9.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-03-30 10:27:23 +02:00
7bdc974704
Merge branch 'develop' into release
2020-03-26 15:15:38 -05:00
fe8780d49c
chore(news): Bailey
2020-03-26 15:15:25 -05:00
eb4e382ecf
stop 'pts' from overflowing to next line
2020-03-26 14:52:25 +11:00
6e8bdf4cdf
Merge branch 'release' into develop
2020-03-24 13:14:15 -05:00
3e96e54ad8
feat(event): eggy eggy
2020-03-24 13:13:50 -05:00
5cf6a67a36
(website/client/src/components/settings/site.vue): Fix refresh the de-register social media buttons. ( #11992 )
2020-03-23 17:49:00 +01:00
f6484c872a
Fixes Japanese conversion bugs on Safari and Chrome ( #11917 )
...
decided to fix using flags since KeyboardEvent.isComposing behaves differently depending on the browser
2020-03-23 16:35:17 +01:00
f973bf1038
build(deps): [security] bump acorn in /website/client ( #11996 )
...
Bumps [acorn](https://github.com/acornjs/acorn ) from 6.3.0 to 6.4.1. **This update includes a security fix.**
- [Release notes](https://github.com/acornjs/acorn/releases )
- [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.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-03-23 10:35:10 +01:00
aaea985cf2
build(deps): bump bootstrap-vue from 2.7.0 to 2.8.0 in /website/client ( #11997 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.7.0 to 2.8.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.7.0...v2.8.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-03-23 10:34:57 +01:00
fd2c4e3265
fix(sprites): CUBBB
2020-03-18 13:35:53 -05:00
55feebdf9e
Merge branch 'release' into develop
2020-03-17 15:36:35 -05:00
d8a99647e7
chore(sprites): compile
2020-03-17 15:35:49 -05:00
411f82202b
feat(content): Spring Fling 2020
2020-03-17 14:49:22 -05:00
5a5a6e4c5d
feat(content): Spring Fling 2020
2020-03-17 14:48:49 -05:00
914eee015e
Merge branch 'release' into develop
2020-03-17 09:12:29 -05:00
92c3a640ee
feat(content): Bug Bonanza achievement
2020-03-17 09:11:41 -05:00
a301f817e9
Fix for party members missing from header after viewing private messages / inbox / PMs ( #11912 )
...
* Fix bug in missing party members in app header
* Modified by running lint
* Change code for handling missing party members in app header from within computed hiddenHeader property to watcher function on hiddenHeader
Co-authored-by: osiris <eynsan@yahoo.co.uk >
2020-03-16 22:17:52 +01:00
519af8f1b6
Fix for search guilds result being inconsistent between "My Guilds" and "Discover Guilds" ( #11903 )
...
* Fix bug to allow guild summary and description to match against search term in MyGuilds component
* Add unit test to groupUtilities to test filterGroup function
* Changes made after running npm:run:lint
* Fix bug when filter guild function does not match against guild size correctly when the guild has member count = 100 or 1000
According to habitica wiki Guilds Guide, gold-tier guilds are guilds with 1000 or more members. However, under the current code of filter guild function, it matches guilds as gold-tier as strictly more than 1000 members, excluding 1000 members. Similar silver-tier guilds should have 100 to 999 members, but the current code it matches guilds as silver-tier for members between 101 and 999 members.
* Added unit tests to test the newly added code in the groupsUtilities mixin for the current issue
* Add unit testing to test search guild name, summary, and description in myGuilds component
* Add suggestions from lint
* Added searching by guild summary and white space handling in search terms.
For discover guilds component, added the following:
1) handling of searching by guild summary
2) preventing white space in search terms to display all guilds
3) added test cases for testing the search functionality in discove guilds to ensure consistent behaviour between the searching in MyGuilds and public guilds.
* Remove console statements from test file
* Implement suggestions from lint.
Co-authored-by: osiris <eynsan@yahoo.co.uk >
2020-03-16 20:03:48 +01:00
a71abea032
build(deps): bump @storybook/addon-knobs in /website/client ( #11977 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs ) from 5.3.14 to 5.3.17.
- [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/v5.3.17/addons/knobs )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-16 15:26:27 +01:00
ddfa3f8a91
build(deps): bump @storybook/vue in /website/client ( #11984 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 5.3.14 to 5.3.17.
- [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/v5.3.17/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>
2020-03-16 15:22:52 +01:00
e2d1de0cf0
build(deps): bump @storybook/addon-links in /website/client ( #11975 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 5.3.14 to 5.3.17.
- [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/v5.3.17/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>
2020-03-16 15:22:36 +01:00
4960171565
build(deps): bump sass from 1.26.2 to 1.26.3 in /website/client ( #11973 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.2 to 1.26.3.
- [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.2...1.26.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-16 15:19:54 +01:00
0960eaf571
build(deps): bump amplitude-js from 5.9.0 to 5.10.0 in /website/client ( #11979 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 5.9.0 to 5.10.0.
- [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/v5.9.0...v5.10.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-03-16 15:19:33 +01:00
dependabot-preview[bot]