4ee14e7c2a
Merge branch 'release' into develop
2020-03-10 14:26:47 -05:00
86951916e8
feat(content): enable bug hugging
2020-03-10 14:25:30 -05:00
0936c2ff86
Special case for member profile name. ( #11918 )
...
* Special case for member profile name.
Use a case insensitive order by
* Use of localeCompare function for name comparison
2020-03-09 17:59:30 +01:00
bdedf8f563
Fix asc/desc sort order when sorted by name ( #11919 )
...
* Fix asc/desc sort order when sorted by name
* Revert changes.
Use localeCompare but considering sort order
2020-03-09 17:56:43 +01:00
9220323483
Move collapseChecklist tooltip ( #11954 )
...
So that checklist items can be checked even when tooltip shown
Fixes #11888
2020-03-09 17:28:09 +01:00
80c93ad934
Merge branch 'release' into develop
2020-03-09 16:22:08 +01:00
010da977a4
fix(sign up): prevent double request to sign up route
2020-03-09 16:21:57 +01:00
effb66a089
Replace setUsernameNotificationBody setting with changeUsernameDisclaimer and alter disclaimer text ( #11953 )
2020-03-09 15:48:54 +01:00
99960da2eb
build(deps): bump bootstrap-vue from 2.5.0 to 2.6.1 in /website/client ( #11963 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.5.0 to 2.6.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.5.0...v2.6.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-09 13:33:38 +01:00
35b5285ce6
build(deps): bump eslint-plugin-vue in /website/client ( #11964 )
...
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases )
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.2.1...v6.2.2 )
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-09 13:30:18 +01:00
bd8e67a2ea
Adventure Guide Prep ( #11883 )
...
* WIP(adventure): prereqs
* WIP(drops): new modal
* WIP(adventure): analytics fixes etc
* feat(adventure): random egg+potion on 2nd task
* fix(lint): noworkies
* fix(modal): correctly construct classes
* fix(tests): expectations and escape
* fix(first-drops): address comments
* fix(first-drops): don't give random drops until first drops
* fix(drops): remove more Level 3 references
* refactor(drops): no need for cloning
* refactor(drops): unnecessary export
* fix(first-drops): force sync
* fix(first-drops): move to server
* fix(first-drops): escape in case we get here with >0 items
* fix(lint): line length
* fix(pet-food): remove unused string
2020-03-07 13:03:13 -06:00
fe6c21800c
Fixing layout issues for the private messages page ( #11766 )
...
* fix: first batch of layout issues for private messages + auto sizing textarea
* username second line - open profile on face-avatar/conversation name - fix textarea height
* refresh on sync
* new "you dont have any messages" style + changed min textarea height
* new conversationItem style / layout
* reset message unread on reload
* fix styles / textarea height
* list optOut / chatRevoked informations for each conversation + show why its disabled
* Block / Unblock - correct disabled states - $gray-200 instead of 300/400
* canReceive not checking chatRevoked
* fix: faceAvatar / userLink open the selected conversation user
* check if the target user is blocking the logged-in user
* check if blocks is undefined
* max-height instead of height
* fix "no messages" state + canReceive on a new conversation
* fixed conversations width (280px on max 768 width page)
* call autosize after message is sent
* only color the placeholder
* only load the current user avatar/settings/flags
* show only the current avatar on private messages
2020-03-04 17:50:08 +01:00
2ff9dfe965
Fix username links resulting in truncated chat messages ( #11945 )
...
* introduce MAX_MESSAGE_LENGTH constant
* add test
* fix path
* fix and tests
* fix typo in tests
2020-03-04 11:49:14 +01:00
3fe307f6ea
Merge branch 'release' into develop
2020-03-03 16:15:52 -06:00
08856ecc9f
chore(news): nother Bailey
2020-03-03 16:12:30 -06:00
5ad30e815a
Change where members info is retrieved in Group component: Fixes #11737 ( #11886 )
...
* Change where members info is retrieved in Group component.
In Group component, changes the place where members data is retrieved from the load function originally to within the watch group function, so that when group data has changed, the code will update the corresponding members data as well.
* Moving the code for loading members data from watcher to inside fetchGuilds function
* Complying with lint
Co-authored-by: kazekunGb <eynsan@yahoo.co.uk >
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-03-02 22:09:53 +01:00
6192b563e9
chore(sprites): compile
2020-03-02 07:33:03 -06:00
a4f84342ca
build(deps): bump @storybook/addon-actions in /website/client ( #11929 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 5.3.13 to 5.3.14.
- [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.14/addons/actions )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:18:24 +01:00
a90d1187e0
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client ( #11937 )
...
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.2.2 to 4.2.3.
- [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.2.3/packages/@vue/cli-plugin-unit-mocha )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:18:17 +01:00
88b130a219
build(deps): bump @storybook/addon-actions in /website/client
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 5.3.13 to 5.3.14.
- [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.14/addons/actions )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 09:17:33 +00:00
637e179951
build(deps): bump @vue/cli-plugin-eslint in /website/client ( #11928 )
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.2.2 to 4.2.3.
- [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.2.3/packages/@vue/cli-plugin-eslint )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:16:38 +01:00
0787582e58
build(deps): bump @storybook/addon-notes in /website/client ( #11933 )
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.13 to 5.3.14.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.14/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.14/addons/notes )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:14:02 +01:00
1c942eb8f3
build(deps): bump @storybook/addon-knobs in /website/client ( #11932 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs ) from 5.3.13 to 5.3.14.
- [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.14/addons/knobs )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:13:50 +01:00
3f2d1bf430
build(deps): bump @vue/cli-service in /website/client ( #11936 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.2.2 to 4.2.3.
- [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.2.3/packages/@vue/cli-service )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:10:46 +01:00
42cfc7d851
build(deps): bump @storybook/vue in /website/client ( #11934 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 5.3.13 to 5.3.14.
- [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.14/app/vue )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:10:32 +01:00
ef7724203e
build(deps): bump sass from 1.25.0 to 1.26.2 in /website/client ( #11938 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.25.0 to 1.26.2.
- [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.25.0...1.26.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:10:14 +01:00
09cec21cde
build(deps): bump @storybook/addon-links in /website/client ( #11939 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 5.3.13 to 5.3.14.
- [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.14/addons/links )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:10:08 +01:00
fc987c11e9
build(deps): bump vue-router from 3.1.5 to 3.1.6 in /website/client ( #11931 )
...
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.1.5 to 3.1.6.
- [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.1.5...v3.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:09:54 +01:00
3678861c48
build(deps): bump @vue/cli-plugin-router in /website/client ( #11935 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.2.2 to 4.2.3.
- [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.2.3/packages/@vue/cli-plugin-router )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:09:30 +01:00
a6463e1fba
build(deps): bump babel-eslint from 10.0.3 to 10.1.0 in /website/client ( #11942 )
...
Bumps [babel-eslint](https://github.com/babel/babel-eslint ) from 10.0.3 to 10.1.0.
- [Release notes](https://github.com/babel/babel-eslint/releases )
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.3...v10.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:09:02 +01:00
0e4d4c2235
build(deps): bump webpack from 4.41.6 to 4.42.0 in /website/client ( #11940 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.41.6 to 4.42.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.41.6...v4.42.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:08:49 +01:00
09b76008ea
build(deps): bump @vue/cli-plugin-babel in /website/client ( #11943 )
...
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.2.2 to 4.2.3.
- [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.2.3/packages/@vue/cli-plugin-babel )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 10:08:37 +01:00
c00a1d74f9
Allow group links on challenge details to be opened in a new tab ( #11889 )
...
* - Use `router-link` in `groupLink` to make links that can be followed in a new tab
* - Add back the missing `if` statement that was removed in error
2020-02-29 18:46:41 +01:00
cbcfb21deb
chore(sprites): compile
2020-02-28 15:27:22 -06:00
07d6969764
Merge branch 'develop' into release
2020-02-27 15:00:46 -06:00
bad148148c
Enchanted Armoire immediately updates XP stat in header ( fixes #11827 ) ( #11884 )
...
* sync user if Armoire gives XP
* user can level up from Armoire
* remove XP amount from Armoire XP notification
2020-02-24 22:19:48 +01:00
e502588abc
Improve G1G1 process ( #11792 )
...
* WIP(g1g1): notif
* WIP(g1g1): notif cont'd
* WIP(gifting): partial modal implementation
* feat(gifting): select giftee modal
* fix(gifting): notification order, modal dismiss
* fix(modals): correct some repops
* fix(gifting): style updates
* fix(modals): new dismiss logic
* fix(modals): new dismiss no go??
* refactor(close): catch up with dismiss functionality
* refactor(g1g1): optimizations
2020-02-24 16:54:56 +01:00
5718d8396d
build(deps): bump svg-inline-loader in /website/client ( #11891 )
...
Bumps [svg-inline-loader](https://github.com/sairion/svg-inline-loader ) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/sairion/svg-inline-loader/releases )
- [Changelog](https://github.com/webpack-contrib/svg-inline-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sairion/svg-inline-loader/compare/v0.8.0...v0.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 14:29:55 +01:00
b59a63ecbe
build(deps): bump bootstrap-vue from 2.4.2 to 2.5.0 in /website/client ( #11893 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.4.2 to 2.5.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.4.2...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 14:29:39 +01:00
f0465aab5e
build(deps): bump inspectpack from 4.3.1 to 4.4.0 in /website/client ( #11892 )
...
Bumps [inspectpack](https://github.com/FormidableLabs/inspectpack ) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/FormidableLabs/inspectpack/releases )
- [Changelog](https://github.com/FormidableLabs/inspectpack/blob/master/HISTORY.md )
- [Commits](https://github.com/FormidableLabs/inspectpack/compare/v4.3.1...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 14:29:29 +01:00
39ee78127c
build(deps): bump eslint-plugin-vue in /website/client ( #11894 )
...
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue ) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases )
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.2.0...v6.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 14:29:04 +01:00
23fc969432
build(deps): bump svg-inline-loader in /website/client
...
Bumps [svg-inline-loader](https://github.com/sairion/svg-inline-loader ) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/sairion/svg-inline-loader/releases )
- [Changelog](https://github.com/webpack-contrib/svg-inline-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sairion/svg-inline-loader/compare/v0.8.0...v0.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 08:08:33 +00:00
5db606dcfd
fix(event): end Valentine's NPCs
2020-02-20 14:26:25 -06:00
0b57c0a22d
Unify behaviour for shops ( #11829 )
...
* Change price for basilist and dustbunnies
* return correct unlockCondition for moon quests
* Fix basilist not being buyable
2020-02-20 13:24:43 -06:00
5e31278d2a
chore(news): Bailey
2020-02-20 11:57:56 -06:00
f413073d35
Merge branch 'release' into develop
2020-02-18 14:15:21 -06:00
27b9ffb3f2
fix lint in challengeModal
2020-02-18 17:26:14 +01:00
79597cc72b
Challenge exception-handling / clientside prize validation ( #11769 )
...
* fix: added client-side validation for challenge prizes
This commit aims to solve the issue #11765 by adding client-side
validation for the challenge prize. This way, a user is unable to create
a challenge if the prize is higher than what they can afford. Also, the
loading property is reset to false after fetching the challenge, however
this won't work if the request isn't successful.
* style: make validation conditional clearer
* fix: add exception handling when doing server requests.
This commit adds a basic try/catch block for handling server-side
errors, and successfully enables the submit button if something failed.
This may also fix #11545 , in which a server-side error, difficult to
valide from the client, was causing the submit button to stay disabled
until reload.
* fix: reenable prize validation
* fix: bad indentation
* fix: Enable submit button on input change
* fix: add throttling to enableSubmit event.
* fix: reenable prize client-side validation.
2020-02-18 17:06:42 +01:00
353009821f
[ Fix #11824 ] Show member Display Name if Username is blank ( #11826 )
...
* #11824 memberSearchDropdown: use member.profile.name if username is blank
* membwer.auth.local object could be empty
2020-02-18 17:00:30 +01:00
69179c61b1
feat(content): Cotton Candy Pink Prizes
2020-02-17 11:37:37 -06:00
Sabe Jones