Commit Graph

2706 Commits

Author SHA1 Message Date
Sabe Jones 7280c50963 feat(content): Freshwater Friends cheevo 2020-07-27 14:17:43 -05:00
Sabe Jones bea77e9520 Merge branch 'develop' into release 2020-07-23 10:44:40 -05:00
Sabe Jones 108201a465 chore(sprites): compile 2020-07-23 10:44:12 -05:00
Sabe Jones 8d9851a489 Merge branch 'release' into develop 2020-07-21 14:58:42 -05:00
Sabe Jones c5e02292c4 feat(content): award yearly Orcas 2020-07-21 14:57:52 -05:00
negue 0261d12bd9 Profile Page: redesign gear label (#12395)
* redesign gear label + lintOnSave not in development environment

* fix lint / build

* fix(lint): remove extra parens

* fix break-word + remove lintOnSave

* remove unneeded styles

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-07-17 12:43:27 +02:00
Sabe Jones 0af5593611 chore(sprites): compile 2020-07-16 15:11:49 -05:00
Sabe Jones e54bd8f242 Merge branch 'develop' into release 2020-07-16 14:58:25 -05:00
Sabe Jones 15753de3a1 feat(content): Seafoam and Amigos 2020-07-14 16:11:34 -05:00
Matteo Pagliazzi 2a0bc030d8 Merge pull request #12385 from HabitRPG/fix/time-travelers-pinning
fix filter reset on pinning items
2020-07-13 11:53:03 +02:00
dependabot-preview[bot] 6082f77977 build(deps): bump lodash from 4.17.15 to 4.17.19 in /website/client (#12386)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-13 10:43:58 +02:00
dependabot-preview[bot] f6717a0bc1 build(deps): bump vuedraggable from 2.23.2 to 2.24.0 in /website/client (#12388)
Bumps [vuedraggable](https://github.com/SortableJS/Vue.Draggable) from 2.23.2 to 2.24.0.
- [Release notes](https://github.com/SortableJS/Vue.Draggable/releases)
- [Commits](https://github.com/SortableJS/Vue.Draggable/compare/v2.23.2...v2.24.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-07-13 10:43:42 +02:00
dependabot-preview[bot] 2758414b54 build(deps): bump sass from 1.26.9 to 1.26.10 in /website/client (#12392)
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.9 to 1.26.10.
- [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.9...1.26.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-13 10:43:13 +02:00
negue 0acc7d19c5 fix filter reset on pinning items - fixes #9500 2020-07-12 20:43:51 +02:00
Sabe Jones 195928e471 Merge branch 'release' into develop 2020-07-10 11:05:31 -05:00
Sabe Jones 9e82ba261b fix(columns): avoid a Vue error on initial load 2020-07-10 10:50:27 -05:00
negue 566dd2b6b1 fix new pm canReceive (#12369) 2020-07-08 11:30:27 +02:00
Sabe Jones 955c41f744 Merge branch 'release' into develop 2020-07-07 14:53:52 -05:00
Sabe Jones 264d6b466a chore(sprites): compile 2020-07-07 14:39:27 -05:00
dependabot-preview[bot] 00c9fabf8b build(deps): bump amplitude-js from 6.2.0 to 7.1.0 in /website/client (#12375)
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 6.2.0 to 7.1.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/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-07-07 20:04:07 +02:00
Matteo Pagliazzi 45a22470fa fix 9351: sync player that casts spells immediately (#12367) 2020-07-05 00:01:02 +02:00
Matteo Pagliazzi 1efcaa4a1d fix #12364, profile of logged in user did not show up correctly 2020-07-03 14:35:29 +02:00
Matteo Pagliazzi cc5e3ed123 fix #12364, profile of logged in user did not show up correctly 2020-07-03 14:17:39 +02:00
Sabe Jones 5a7e1cbc5a Merge branch 'release' into develop 2020-07-01 16:37:22 -05:00
Sabe Jones fb6eacf8f9 chore(news): Bailey 2020-07-01 16:36:51 -05:00
Matteo Pagliazzi 3d5630d5a2 chore: update sub-deps and fix lint 2020-07-01 18:20:18 +02:00
Sabe Jones 40cadba7bf Merge branch 'release' into develop 2020-06-29 15:15:54 -05:00
Sabe Jones ee2a5fe6b3 chore(sprites): compile 2020-06-29 15:15:19 -05:00
wwyl1234 2c096d5feb Changed flex box direction to column. Changed other css properties such that tag names do not collapse when view width is changed on the browser. (#12332)
Co-authored-by: Winnie Lam <winnielam@Winnies-MacBook-Air.local>
2020-06-29 18:21:57 +02:00
Matteo Pagliazzi b2833ac4a2 fix(challenge): sync user when joining a challenge - make sure new tag is synced immediately 2020-06-29 17:05:37 +02:00
Alexandrea Beh da60f44356 Issue 12220 stealth tooltip show protected dailies (#12255)
* Issue 12220 - Show dailies protected by Stealth

A feature on the old site showed the number of
dailies protected by casting Stealth. This is
now showing again in the Stealth tooltip. The
skillNotes section was not being called. It
adds additional skill-specific info: the dailies
avoided by stealth, whether stealth no longer
needs to be cast (dailies already avoided) and
whether frost is no longer useful to cast.

Speculation: the spellDisabled method had some
commented out code regarding Stealth, which
may have broken due to a change in how dailies
are referenced. I have fixed this line, so it
seemed alright to keep the entirety of the
skillNotes function as it had been. However,
this includes more than just showing dailies
in the tooltip.

Behavior changes:
- tooltip shows dailies avoided for Stealth
- tooltip shows maxed out message for
Stealth when all dailies are covered
- tooltip shows frost already cast message
when frost has already been cast

* clean up conditions in skillNotes

* use future tense for rogue stealth dailies tooltip

* use getter for accurate task length

* consider stealth disabled based on incomplete dailies due, not all dailies

* Issue 12220 - Show dailies protected by Stealth

A feature on the old site showed the number of
dailies protected by casting Stealth. This is
now showing again in the Stealth tooltip. The
skillNotes section was not being called. It
adds additional skill-specific info: the dailies
avoided by stealth, whether stealth no longer
needs to be cast (dailies already avoided) and
whether frost is no longer useful to cast.

Speculation: the spellDisabled method had some
commented out code regarding Stealth, which
may have broken due to a change in how dailies
are referenced. I have fixed this line, so it
seemed alright to keep the entirety of the
skillNotes function as it had been. However,
this includes more than just showing dailies
in the tooltip.

Behavior changes:
- tooltip shows dailies avoided for Stealth
- tooltip shows maxed out message for
Stealth when all dailies are covered
- tooltip shows frost already cast message
when frost has already been cast

* factor out stealthBuffsToAdd for casting stealth + tooltip previewing dailies avoided

* fix merge conflict
2020-06-29 11:12:19 +02:00
dependabot-preview[bot] 911a44adec build(deps): bump @vue/cli-plugin-unit-mocha in /website/client (#12351)
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha) from 4.4.4 to 4.4.6.
- [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.4.6/packages/@vue/cli-plugin-unit-mocha)

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-06-29 10:53:08 +02:00
dependabot-preview[bot] e38a455922 build(deps): bump @vue/cli-plugin-eslint in /website/client (#12353)
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.4.4 to 4.4.6.
- [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.4.6/packages/@vue/cli-plugin-eslint)

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-06-29 10:52:23 +02:00
dependabot-preview[bot] c6f825ac31 build(deps): bump @vue/cli-plugin-router in /website/client (#12349)
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router) from 4.4.4 to 4.4.6.
- [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.4.6/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-06-29 10:46:53 +02:00
dependabot-preview[bot] 72acdf5884 build(deps): bump @vue/cli-service in /website/client (#12354)
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 4.4.4 to 4.4.6.
- [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.4.6/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-06-29 10:46:32 +02:00
dependabot-preview[bot] 8a527ec10a build(deps): bump sass from 1.26.8 to 1.26.9 in /website/client (#12355)
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.8 to 1.26.9.
- [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.8...1.26.9)

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-29 10:46:16 +02:00
dependabot-preview[bot] d7d433175d build(deps): bump @vue/cli-plugin-babel in /website/client (#12344)
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 4.4.4 to 4.4.6.
- [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.4.6/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-06-29 10:46:03 +02:00
dependabot-preview[bot] c923bd8efb build(deps): bump uuid from 8.1.0 to 8.2.0 in /website/client (#12346)
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v8.1.0...v8.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-06-29 10:44:21 +02:00
Matteo Pagliazzi a352a351bf Merge https://github.com/HabitRPG/habitica/pull/12338 "Added the task type to the Delete alert window"
by @Shuyinsama
Squashed commit of the following:

commit 0c05ff510e4bd0d7161c49245dd11e6abe882d96
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date:   Sat Jun 27 19:41:58 2020 +0200

    fix lint

commit 2e1e1e4071d57fa2853a4a8f481c94bd5836037f
Merge: cbc9af4ef5 fc46d73b1d
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date:   Sat Jun 27 19:39:58 2020 +0200

    Merge branch 'feature/Deleting-a-reward-asks-you-if-you-want-to-delete-the-task' of https://github.com/Shuyinsama/habitica into Shuyinsama-feature/Deleting-a-reward-asks-you-if-you-want-to-delete-the-task

commit fc46d73b1d
Author: Patrick van Zadel <Shuyinsama@users.noreply.github.com>
Date:   Sat Jun 27 18:54:08 2020 +0200

    Renamed keys and fixed a check in the modal

commit ec5b765f5c
Author: Patrick van Zadel <Shuyinsama@users.noreply.github.com>
Date:   Sat Jun 27 18:45:25 2020 +0200

    Renamed translation keys

commit f0837dc571
Author: Patrick van Zadel <patrickvanzadel@eleven.nl>
Date:   Tue Jun 23 23:06:59 2020 +0200

    Added the task type to the "Delete" alert window so it now asks if you want to delete the task of type
    Edited the "Delete this ..." button in the edit task modal to represent the task type
2020-06-27 19:42:24 +02:00
Matteo Pagliazzi cbc9af4ef5 fix(top menu): remove outline when sync button is pressed 2020-06-27 17:04:43 +02:00
jacobguinther e42518f427 Make message links to deleted profiles display 404: (fixes 11020) (#12229)
* Make links to deleted profiles display 404

* Implement some requested changes

- remove comments
- remove 'await'
- rename error -> 404error
- remove catch block -> just check for 404

* Fix bug: Logged in user profile showing 404

- Initiallty logged in user will display fine
- This bug only appeared after you view a deleted users modal

* Remove 'user.active' attribute

- add change to data():
- user: undefined -> user: {}

* Shorten showMemberModal()

- Remove unused fetch profile data
- Remove unnecessary conditional

* Change user initial value to null

- Add userLoaded to data
2020-06-27 16:53:55 +02:00
Sabe Jones 2a85f2d27f chore(news): Bailey
and set up A/B test for drop curve
2020-06-25 14:29:53 -05:00
Tressley Cahill b74d3343d1 Merge pull request #12314 from HabitRPG/hotfix/groups-checklist-toggle
Groups: always show checklist-toggle
2020-06-25 10:01:15 -04:00
Sabe Jones 52914ed17e Merge branch 'release' into develop 2020-06-23 14:36:41 -05:00
Sabe Jones e52fec08a0 feat(event): Splashy Skins 2020-06-23 14:30:39 -05:00
Patrick van Zadel b2bb251522 Bugfix/show the correct negative icon in challenge habit (#12313)
* Habits in the challenge view have incorrect and misaligned negative icon
Change the check for the negative icon to something more suitable so the lock icon is shown when needed

* Habits in the challenge view have incorrect and misaligned negative icon
Removed the check for task.group.id

Co-authored-by: Patrick van Zadel <patrickvanzadel@eleven.nl>
2020-06-23 11:36:49 +02:00
Matteo Pagliazzi b96a940d82 Upgrade client dependencies (#12329)
* upgrade amplitude-js to v6

* upgrade svg-url-loader

* upgrade uuid

* upgrade validator
2020-06-22 12:04:58 +02:00
dependabot-preview[bot] 1ecfdbadc9 build(deps): bump smartbanner.js in /website/client (#12316)
Bumps [smartbanner.js](https://github.com/ain/smartbanner.js) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/ain/smartbanner.js/releases)
- [Commits](https://github.com/ain/smartbanner.js/compare/v1.15.0...v1.16.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-06-22 10:27:38 +02:00
dependabot-preview[bot] 2ecca3b388 build(deps): bump moment from 2.26.0 to 2.27.0 in /website/client (#12315)
Bumps [moment](https://github.com/moment/moment) from 2.26.0 to 2.27.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.26.0...2.27.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-06-22 10:25:57 +02:00
negue 03dd469a45 always show checklist-toggle 2020-06-20 21:08:44 +02:00