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
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
fd0ec41c53
build(deps): bump vue2-perfect-scrollbar in /website/client ( #11983 )
...
Bumps [vue2-perfect-scrollbar](https://github.com/mercs600/vue2-perfect-scrollbar ) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/mercs600/vue2-perfect-scrollbar/releases )
- [Commits](https://github.com/mercs600/vue2-perfect-scrollbar/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-03-16 15:18:53 +01:00
1420e1c8d7
build(deps): bump bootstrap-vue from 2.6.1 to 2.7.0 in /website/client ( #11985 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.6.1 to 2.7.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.6.1...v2.7.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:18:40 +01:00
c7c854664f
build(deps): bump @storybook/addon-notes in /website/client ( #11986 )
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.17/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/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-03-16 15:18:31 +01:00
68e5679340
build(deps): bump @storybook/addon-actions in /website/client ( #11987 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) 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/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-03-16 15:18:25 +01:00
32a9dda2c6
build(deps): bump @storybook/addon-notes in /website/client
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.17/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/addons/notes )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-16 08:29:26 +00:00
1411706963
fix(party members): clone array to avoid infinite loops, fixes #11969
2020-03-13 23:48:10 +01:00
39bb60638f
feat(content): Pi Day 2020
2020-03-13 10:59:52 -05:00
f01aba15be
fix(lint): run npm lint to fix formatting
2020-03-11 13:04:03 +01:00
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
Sabe Jones