d7fe140012
build(deps): [security] bump websocket-extensions in /website/client ( #12277 )
...
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node ) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases )
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-07 12:51:49 +02:00
8a1c1af461
Merge branch 'release' into develop
2020-06-01 16:41:00 -05:00
6253359d31
chore(news): Bailey
2020-06-01 16:40:33 -05:00
ce4bbe5552
fix(ui): make sure three columns of rewards are displayed + fix rewards top margin when no custom reward exists ( #12257 )
2020-06-01 17:35:52 +02:00
3a4abac8b0
Store original quantities, to avoid reordering in Inventory Items screen ( #12205 )
...
* Store original quantities, to avoid reordering
Create a quantity snapshot when loading the screen.
Sort based on the snapshot after updates.
Fixes: 12040
* Avoid initial branching
Co-authored-by: Bart Enkelaar <benkelaar@gmail.com >
* Add comment
Co-authored-by: Bart Enkelaar <benkelaar@gmail.com >
2020-06-01 17:25:55 +02:00
44eb245184
New notification type for boss damage ( #12249 )
...
* Add new notification type for boss damage with sword icon
* Use vars for color
2020-06-01 15:42:54 +02:00
050fd15c97
build(deps): bump vue-router from 3.2.0 to 3.3.2 in /website/client ( #12268 )
...
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.2.0 to 3.3.2.
- [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.2.0...v3.3.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-06-01 10:37:40 +02:00
3bfcc4a605
chore(deps): upgrade vue cli plugins
2020-06-01 10:34:36 +02:00
79f6f47b16
build(deps): bump sass from 1.26.5 to 1.26.7 in /website/client ( #12258 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.5 to 1.26.7.
- [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.5...1.26.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-01 10:26:15 +02:00
6ff8254137
Only show attainable and owned special pets/mounts ( #12206 )
...
* Only show attainable and owned special pets/mounts
Fixes #9498
* #9498 : Handle comments
Don't change API,
put canFind in petInfo and mountInfo
* #9498 : Move canFind to itemInfo, to allow sync
* #9498 : Create a show method, to allow update without reload.
2020-05-31 22:08:18 +02:00
c9bf157c23
fix(achievements): show-all layout
2020-05-29 10:33:30 -05:00
d953ea14da
Merge branch 'develop' into release
2020-05-28 16:51:37 -05:00
0c179fee2f
chore(sprites): compile
2020-05-28 16:51:20 -05:00
670b6a1563
fix(ui): adjust loading gryphon sizes and search members dropdown
2020-05-26 18:02:48 +02:00
08f1e2b273
Client: remove unnecessary API calls + members fixes ( #12179 )
...
* wip
* refactor world state
* allow resource to be reloaded when the server is updated
* fix #9242
* fix event listeners
* remove un-needed code
* add tests for asyncResourceFactory reloadOnAppVersionChange
* fix double cron notifications and party members showing up in the header after a party invitation is accepted
* remove console.log
* do not send vm info to loggly due to circular dependency + fix typo
* fix #12181
* do not load invites multiple times in members modal
* add hover to challenge member count
* groups: load members only on demand
* minor ui fixes
* choose class: fix vue duplicate key warning
* minor ui fixes
* challanges: load members on demand
* add loading spinner
* change loading mechanism
* fix loading gryphon issues
* reduce code duplication
2020-05-25 17:02:29 +02:00
ca80f4ee33
build(deps): bump @storybook/addon-knobs in /website/client ( #12243 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs ) from 5.3.18 to 5.3.19.
- [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.19/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-05-25 13:11:34 +02:00
65cbee9e75
build(deps): bump @storybook/addon-notes in /website/client ( #12245 )
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.18 to 5.3.19.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.19/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.19/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>
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-05-25 13:05:02 +02:00
0f8563c14e
build(deps): bump inspectpack from 4.4.0 to 4.5.2 in /website/client ( #12246 )
...
Bumps [inspectpack](https://github.com/FormidableLabs/inspectpack ) from 4.4.0 to 4.5.2.
- [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.4.0...v4.5.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-05-25 12:55:35 +02:00
c4117f99ed
build(deps): bump @storybook/addon-actions in /website/client ( #12242 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 5.3.18 to 5.3.19.
- [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.19/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-05-25 12:55:19 +02:00
27aca19c8c
build(deps): bump @storybook/vue in /website/client ( #12238 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 5.3.18 to 5.3.19.
- [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.19/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-05-25 12:55:07 +02:00
80c18ffadd
build(deps): bump bootstrap-vue from 2.14.0 to 2.15.0 in /website/client ( #12239 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.14.0 to 2.15.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.14.0...v2.15.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-05-25 12:54:56 +02:00
bf2c4eb501
build(deps): bump moment from 2.25.3 to 2.26.0 in /website/client ( #12244 )
...
Bumps [moment](https://github.com/moment/moment ) from 2.25.3 to 2.26.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.25.3...2.26.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-05-25 12:54:20 +02:00
ab1828c914
build(deps): bump vue-router from 3.1.6 to 3.2.0 in /website/client ( #12237 )
...
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.1.6 to 3.2.0.
- [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.6...v3.2.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-05-25 12:54:03 +02:00
b32f79f682
build(deps): bump @storybook/addon-links in /website/client ( #12236 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 5.3.18 to 5.3.19.
- [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.19/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-05-25 12:53:39 +02:00
9d4fb80d15
Add close button to profile modal ( #12203 )
2020-05-22 17:48:15 +02:00
6e46794822
build(deps): bump bootstrap from 4.4.1 to 4.5.0 in /website/client ( #12211 )
...
Bumps [bootstrap](https://github.com/twbs/bootstrap ) from 4.4.1 to 4.5.0.
- [Release notes](https://github.com/twbs/bootstrap/releases )
- [Commits](https://github.com/twbs/bootstrap/compare/v4.4.1...v4.5.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-05-22 17:45:25 +02:00
734eae64a5
fix(avatar transormation): move questProgress method to spells mixin so that it is always available
2020-05-22 16:35:00 +02:00
032c95d5c8
fix(avatar transormation): move questProgress method to spells mixin so that it is always available
2020-05-22 13:28:44 +02:00
95a3c932c5
Merge branch 'develop' into release
2020-05-21 14:59:58 -05:00
51d1f6b86a
Merge branch 'sabrecat/feedback-links' into release
2020-05-21 14:59:43 -05:00
809bacd10b
chore(sprites): compile
2020-05-21 14:59:35 -05:00
a1ec42c0b2
Fix Issue #12103 : Wacky potions purchase warning ( #12172 )
...
* Fix Issue #12103 : Wacky potions purchase warning
For wacky potions lower petsRemaining by 9,
to exclude the mounts that don't exist.
* Fix Issue #12103 : Wacky potions purchase warning
Handle comments
* Use includes instead of indexOf() !== -1
* use droppEggs and dropHatchingPotions instead of fixed amounts
2020-05-20 13:27:31 +02:00
8674ea55f9
#11828 : Show a boss damage notification for skills ( #12173 )
...
* #11828 : Show a boss damage notification for skills
Brutal Smash and Burst of Flames skills should show a
boss damage notification
Fixes #11828
* Calculate quest progress regardless of spell target.
2020-05-20 12:32:44 +02:00
c421da34cc
chore(feedback): replace Trello links
2020-05-19 15:15:21 -05:00
36461cbbdf
Merge branch 'release' into develop
2020-05-19 14:01:49 -05:00
d796848887
chore(sprites): compile
2020-05-19 14:00:33 -05:00
80a2e31c8e
feat(content): new achievement and bundle
2020-05-19 14:00:25 -05:00
1bc756ee93
Bolding text inside a link in task title/notes. ( #12178 ) ( #12195 )
...
* Bolding text inside a link in task title/notes. (#12178 )
Before:
* link target opened in new tab
* task edit popup opened
Now:
* link target opened in new tab
Fixes #12178
* Handle PR comments
* Added explanation
* Switched to classList to improve readability
2020-05-19 16:55:43 +02:00
b02ae35b28
build(deps): bump bootstrap-vue from 2.13.1 to 2.14.0 in /website/client ( #12210 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.13.1 to 2.14.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.13.1...v2.14.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-05-18 10:33:13 +02:00
e90175b5d6
chore(deps): update sortablejs version used by vue.draggable
2020-05-15 11:35:28 +02:00
4c7306491b
Merge branch 'develop' into release
2020-05-14 14:03:09 -05:00
1164f5e5f5
chore(news): Bailey at Rest
2020-05-14 14:03:05 -05:00
714a18ce5c
Merge branch 'release' into develop
2020-05-12 15:58:13 -05:00
8747a2d1b6
feat(content): reenable some May potions
2020-05-12 15:57:40 -05:00
56aaca5c0c
build(deps): bump moment from 2.24.0 to 2.25.3 in /website/client
...
Bumps [moment](https://github.com/moment/moment ) from 2.24.0 to 2.25.3.
- [Release notes](https://github.com/moment/moment/releases )
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/moment/moment/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-11 08:55:21 +00:00
c22a2ef9a8
build(deps): bump bootstrap-vue from 2.13.0 to 2.13.1 in /website/client ( #12185 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.13.0 to 2.13.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.13.0...v2.13.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-05-11 10:52:14 +02:00
a3ba1d19ee
build(deps): bump jquery from 3.5.0 to 3.5.1 in /website/client ( #12186 )
...
Bumps [jquery](https://github.com/jquery/jquery ) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.5.0...3.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>
2020-05-11 10:52:03 +02:00
1ebe57b114
Make contributor achievement notification "sticky" ( #12183 )
...
Add ability to define any notification to be "sticky", so that it will not timeout and stays on screen until clicked.
2020-05-09 22:02:20 +02:00
c218b8d56c
Issue 12033 - Use version of habitica-markdown that includes mentions ( #12089 )
...
* Issue 12033 - Use version of habitica-markdown that includes mention plugin
Also fixes frontend parts of 11504 and 10924
* Issue 12033 - Reduce duplication in chatCard & messageCard
* Issue 12033 - Use habitica-markdown version 2.0.0
* Issue 12033 - Use new entry point and fix tests
* Issue 12033 - Rename renderMarkdown to renderWithMentions
2020-05-09 20:04:14 +02:00
29f6bf7dc6
fix(chat) - Mention dot doesn't show if mention is preceded by weird … ( #12177 )
...
* fix(chat) - Mention dot doesn't show if mention is preceded by weird mention
* fix(chat) - add unit test for chatCard
* fix(chat) - Improve unit test to only mount the wrapper once
2020-05-09 19:27:20 +02:00
dependabot-preview[bot]