Sabe Jones
0fb1fd5756
Merge branch 'release' into develop
2021-08-30 16:26:28 -05:00
Sabe Jones
40bf664f20
chore(analytics): various updates to analytics tracking
2021-08-30 16:21:05 -05:00
Sabe Jones
814cd2b64f
Merge branch 'develop' of https://github.com/HabitRPG/habitica into develop
2021-08-30 14:39:15 -05:00
Sabe Jones
74a30fb1ec
Merge branch 'release' into develop
2021-08-30 14:38:12 -05:00
Melior
773b07f2f0
Translated using Weblate (Indonesian)
...
Currently translated at 90.0% (100 of 111 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/id/
Translated using Weblate (Indonesian)
Currently translated at 83.9% (110 of 131 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/id/
Translated using Weblate (Indonesian)
Currently translated at 81.9% (50 of 61 strings)
Translation: Habitica/Messages
Translate-URL: https://translate.habitica.com/projects/habitica/messages/id/
Translated using Weblate (Turkish)
Currently translated at 71.7% (1723 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/tr/
Translated using Weblate (Turkish)
Currently translated at 71.7% (1723 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/tr/
Translated using Weblate (Turkish)
Currently translated at 71.7% (1723 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/tr/
Translated using Weblate (Indonesian)
Currently translated at 76.9% (568 of 738 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/id/
Translated using Weblate (Indonesian)
Currently translated at 100.0% (634 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/id/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (137 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/pt_BR/
Translated using Weblate (Chinese (Traditional))
Currently translated at 97.8% (134 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/zh_Hant/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (137 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (738 of 738 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Thai)
Currently translated at 96.2% (181 of 188 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/th/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (374 of 374 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translated using Weblate (Japanese)
Currently translated at 99.8% (737 of 738 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (127 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (127 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Thai)
Currently translated at 94.8% (130 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/th/
Translated using Weblate (Thai)
Currently translated at 100.0% (8 of 8 strings)
Translation: Habitica/Inventory
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/th/
Translated using Weblate (Chinese (Simplified))
Currently translated at 99.7% (373 of 374 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translated using Weblate (Japanese)
Currently translated at 100.0% (127 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Indonesian)
Currently translated at 89.1% (99 of 111 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/id/
Translated using Weblate (Thai)
Currently translated at 89.2% (166 of 186 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/th/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (137 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/zh_Hans/
Translated using Weblate (Thai)
Currently translated at 31.0% (37 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/th/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (374 of 374 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hant/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (374 of 374 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translated using Weblate (Indonesian)
Currently translated at 80.3% (45 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/id/
Translated using Weblate (Japanese)
Currently translated at 100.0% (371 of 371 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (119 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translated using Weblate (Indonesian)
Currently translated at 100.0% (119 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/id/
Translated using Weblate (Swedish)
Currently translated at 94.1% (129 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/sv/
Translated using Weblate (Japanese)
Currently translated at 100.0% (137 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ja/
Translated using Weblate (Japanese)
Currently translated at 98.3% (117 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translated using Weblate (Thai)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/th/
Translated using Weblate (Thai)
Currently translated at 64.2% (36 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/th/
Translated using Weblate (Thai)
Currently translated at 94.8% (130 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/th/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (186 of 186 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/zh_Hans/
Translated using Weblate (Thai)
Currently translated at 94.1% (129 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/th/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (137 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (738 of 738 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Vietnamese)
Currently translated at 78.9% (94 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/vi/
Translated using Weblate (Czech)
Currently translated at 97.8% (134 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/cs/
Translated using Weblate (Czech)
Currently translated at 72.6% (69 of 95 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/cs/
Translated using Weblate (Czech)
Currently translated at 100.0% (203 of 203 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/cs/
Translated using Weblate (Czech)
Currently translated at 100.0% (180 of 180 strings)
Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/cs/
Translated using Weblate (Japanese)
Currently translated at 99.4% (734 of 738 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (371 of 371 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hans/
Translated using Weblate (Czech)
Currently translated at 100.0% (188 of 188 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/cs/
Translated using Weblate (Czech)
Currently translated at 97.6% (619 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/cs/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (119 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translated using Weblate (Japanese)
Currently translated at 100.0% (2401 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translated using Weblate (Thai)
Currently translated at 64.5% (122 of 189 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/th/
Translated using Weblate (Thai)
Currently translated at 64.5% (122 of 189 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/th/
Translated using Weblate (Thai)
Currently translated at 75.0% (6 of 8 strings)
Translation: Habitica/Overview
Translate-URL: https://translate.habitica.com/projects/habitica/overview/th/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (371 of 371 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.1% (118 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/
Translated using Weblate (Italian)
Currently translated at 100.0% (137 of 137 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/it/
Translated using Weblate (Italian)
Currently translated at 100.0% (738 of 738 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/it/
Translated using Weblate (Italian)
Currently translated at 100.0% (371 of 371 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/it/
Translated using Weblate (Italian)
Currently translated at 100.0% (119 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/it/
Translated using Weblate (Chinese (Simplified))
Currently translated at 98.3% (117 of 119 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
2021-08-30 17:00:54 +02:00
Sabe Jones
e49486e974
chore(sprites): compile
2021-08-28 17:33:16 -05:00
Sabe Jones
8ca9853a2f
feat(content): subscriber items September 2021
2021-08-28 17:33:10 -05:00
Sabe Jones
a08005e5da
Revert "Revert "chore(lint): disable breaking rules""
...
This reverts commit a6e32d0822 .
2021-08-27 18:55:21 -05:00
Sabe Jones
f13e982553
Revert "Revert "chore(lint): run fix""
...
This reverts commit 5179440f77 .
2021-08-27 18:54:55 -05:00
Sabe Jones
5b346690a9
fix(storybook): temporarily disable story
2021-08-26 23:05:48 -05:00
Sabe Jones
e6da2752a7
fix(storybook): temporarily disable story
2021-08-26 23:05:13 -05:00
Sabe Jones
0f668ec96f
Merge branch 'release' into develop
2021-08-26 22:52:34 -05:00
Sabe Jones
e5a19d7fb4
Revert "chore(package): update client lock"
...
This reverts commit 562db48e02 .
2021-08-26 22:50:54 -05:00
Sabe Jones
5179440f77
Revert "chore(lint): run fix"
...
This reverts commit 15fdf2d75a .
2021-08-26 22:50:46 -05:00
Sabe Jones
a6e32d0822
Revert "chore(lint): disable breaking rules"
...
This reverts commit 7207ca8cc4 .
2021-08-26 22:50:37 -05:00
Sabe Jones
7207ca8cc4
chore(lint): disable breaking rules
2021-08-26 21:23:59 -05:00
Sabe Jones
15fdf2d75a
chore(lint): run fix
2021-08-26 21:19:18 -05:00
Sabe Jones
562db48e02
chore(package): update client lock
2021-08-26 21:05:10 -05:00
Sabe Jones
638e29c6cd
chore(packages): update lock
2021-08-26 20:39:41 -05:00
negue
53424d548a
Rework Notifications: separate and bundle to an amount of 4 ( #13300 )
...
* WIP notifications only show 2 at once
* separate and bundle notifications to pairs
* notification fadein/-out/move animations - remove notifications on an interval instead of calculated timeouts
* easier way to import all sprite css files
* add stories + fix sizes / paddings + click to hide + animation fixes
* keep notification at the top but always under the toolbars
* change animations to ease-in 0.25s + add prop to change the delay between deletion and add
* fix adding logic in a rare case of added notifications when only one item is currently visible + add debug mode
* disable lint for notification console
* add more notification example trigger buttons
* potential fix of animation / queue
* increase amount of notifications to 4
* fix sanity
* fix test:unit call again
* new notification styles - fix animations
* keep error notifications visible until manually removed + refactor adding/removal logic
* fix margins
* prevent multiple filling + different delay on filling
* stop and restart removal timer on new notifications
* reduce line-height / apply different margin for icons
* move sprites.scss out and use it in app.vue as well
* update sprites back to 31
2021-08-26 19:56:41 -05:00
Sabe Jones
4f0f058b2d
Merge branch 'develop' into release
2021-08-26 19:54:37 -05:00
Sabe Jones
7f0bdd6a9c
fix(shops): merge issue with mounted() function
2021-08-26 19:54:13 -05:00
Zach Bauer
1a484b56ac
Fix shop item popover staying open after click ( #12921 )
...
* don't refocus shopItem popover on click
* fix webpack compile error
* manually disable and enable popover
* clean up old changes
2021-08-26 19:47:27 -05:00
Alan Cruz
876a7b766c
if selectedpage === 'invites' check if there is any pending invitation, if not, set selectedPage to 'members' ( #13315 )
2021-08-26 19:36:18 -05:00
negue
30c202dbbe
Quest Sidebar: Boss Pending Health inside the normal Bar ( #13317 )
2021-08-26 19:22:56 -05:00
Lu
572e709d63
Settings: Add missing margin to settings checkboxes - Fixes #12794 ( #13319 )
...
* Add missing margin to settings checkboxes
* Fix checkboxes in notifications
2021-08-26 18:42:51 -05:00
Sabe Jones
b4dc3796a1
fix(achievement): Bunny not Rabbit
2021-08-26 18:34:17 -05:00
dependabot[bot]
cae36ea554
build(deps): bump vue-cli-plugin-storybook in /website/client ( #13346 )
...
Bumps [vue-cli-plugin-storybook](https://github.com/storybookjs/vue-cli-plugin-storybook ) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/storybookjs/vue-cli-plugin-storybook/releases )
- [Changelog](https://github.com/storybookjs/vue-cli-plugin-storybook/blob/master/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/vue-cli-plugin-storybook/compare/v2.0.0...v2.1.0 )
---
updated-dependencies:
- dependency-name: vue-cli-plugin-storybook
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 18:33:23 -05:00
Faris P
f9a0939796
Class icon misalignment fixed. fixes #13316 ( #13330 )
...
* change position of class icon on profile modal
Changed the bottom position of class icon on profile modal
* Convert `badgeSize` to pixel
Converted the badgeSize prop to pixel value by adding `+ 'px'`.
2021-08-26 18:33:05 -05:00
dependabot[bot]
62602a997c
build(deps): bump vue and vue-template-compiler in /website/client ( #13336 )
...
Bumps [vue](https://github.com/vuejs/vue ) and [vue-template-compiler](https://github.com/vuejs/vue ). These dependencies needed to be updated together.
Updates `vue` from 2.6.12 to 2.6.14
- [Release notes](https://github.com/vuejs/vue/releases )
- [Commits](https://github.com/vuejs/vue/compare/v2.6.12...v2.6.14 )
Updates `vue-template-compiler` from 2.6.12 to 2.6.14
- [Release notes](https://github.com/vuejs/vue/releases )
- [Commits](https://github.com/vuejs/vue/compare/v2.6.12...v2.6.14 )
---
updated-dependencies:
- dependency-name: vue
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: vue-template-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 18:18:21 -05:00
Nat Welch
7870ffece8
fix(cors): Allow all origins to support 3rd party tools ( #13383 )
2021-08-26 18:12:11 -05:00
KoRnoliX
9a2df5c1e5
Fix habits' dropdown list overlap ( #13385 )
...
Fix habits' tags dropdown list to properly close after expanding
difficulties dropdown list so they don't overlap
2021-08-26 18:09:23 -05:00
KoRnoliX
76fccd80ac
Fix transform atidote unpin after using rebirthing fixes #13306 ( #13400 )
...
* Fix habits' dropdown list overlap
Fix habits' tags dropdown list to properly close after expanding
difficulties dropdown list so they don't overlap
* Fix transform antidote unpin after rebirth
Fix transformation buff antidote to properly unpin from Rewards section
after using Orb of Rebirth
* Revert "Fix habits' dropdown list overlap"
This reverts commit 6a72e27b89 .
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2021-08-26 18:05:59 -05:00
dependabot[bot]
b3adc88138
build(deps): bump intro.js from 3.4.0 to 4.1.0 in /website/client ( #13356 )
...
Bumps [intro.js](https://github.com/usablica/intro.js ) from 3.4.0 to 4.1.0.
- [Release notes](https://github.com/usablica/intro.js/releases )
- [Commits](https://github.com/usablica/intro.js/compare/v3.4.0...v4.1.0 )
---
updated-dependencies:
- dependency-name: intro.js
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 17:52:24 -05:00
dependabot[bot]
c7f58ddf9a
build(deps): bump ws from 6.2.1 to 6.2.2 in /website/client ( #13314 )
...
Bumps [ws](https://github.com/websockets/ws ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/commits )
---
updated-dependencies:
- dependency-name: ws
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 17:08:41 -05:00
dependabot[bot]
b240490142
build(deps-dev): bump @babel/plugin-proposal-optional-chaining ( #13341 )
...
Bumps [@babel/plugin-proposal-optional-chaining](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-optional-chaining ) from 7.14.2 to 7.14.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.14.5/packages/babel-plugin-proposal-optional-chaining )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-optional-chaining"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:35:26 -05:00
dependabot[bot]
96af878c3b
build(deps): bump postcss from 7.0.23 to 7.0.36 in /website/client ( #13342 )
...
Bumps [postcss](https://github.com/postcss/postcss ) from 7.0.23 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases )
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss/compare/7.0.23...7.0.36 )
---
updated-dependencies:
- dependency-name: postcss
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:35:06 -05:00
dependabot[bot]
ecc00889da
build(deps): bump nconf from 0.11.2 to 0.11.3 in /website/client ( #13365 )
...
Bumps [nconf](https://github.com/flatiron/nconf ) from 0.11.2 to 0.11.3.
- [Release notes](https://github.com/flatiron/nconf/releases )
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flatiron/nconf/compare/v0.11.2...v0.11.3 )
---
updated-dependencies:
- dependency-name: nconf
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:33:54 -05:00
Jon Wolverton
f86bb98ccd
Collection quest ignoring items ( #13401 )
...
* update tests to check for issue #12664
* rewrite processCollectionQuest to allocate quest items proportionally
Removes need to check for excess items, fixing issue #12664
* move test for this bug to the correct context section & remove redundant test
* refactor processCollectionQuest more
* tweak confusing comments
2021-08-26 16:33:29 -05:00
dependabot[bot]
234252d7d1
build(deps): bump hellojs from 1.19.3 to 1.19.4 in /website/client ( #13366 )
...
Bumps [hellojs](https://github.com/MrSwitch/hello.js ) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/MrSwitch/hello.js/releases )
- [Changelog](https://github.com/MrSwitch/hello.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.19.3...v1.19.4 )
---
updated-dependencies:
- dependency-name: hellojs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:30:52 -05:00
dependabot[bot]
ccd37a5b88
build(deps): bump vue-router from 3.5.1 to 3.5.2 in /website/client ( #13368 )
...
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.5.1 to 3.5.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.5.1...v3.5.2 )
---
updated-dependencies:
- dependency-name: vue-router
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:23:01 -05:00
KoRnoliX
b3cfcab5fb
Fix negative quest scroll number on bundle purchase ( #13415 )
2021-08-26 16:22:00 -05:00
dependabot[bot]
a322555a36
build(deps): bump amplitude-js from 8.4.0 to 8.5.0 in /website/client ( #13453 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.4.0 to 8.5.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases )
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md )
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.4.0...v8.5.0 )
---
updated-dependencies:
- dependency-name: amplitude-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:55:15 -05:00
dependabot[bot]
13e7d45549
build(deps): bump @storybook/addon-knobs in /website/client ( #13456 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/addon-knobs ) from 6.2.9 to 6.3.0.
- [Release notes](https://github.com/storybookjs/addon-knobs/releases )
- [Changelog](https://github.com/storybookjs/addon-knobs/blob/v6.3.0/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/addon-knobs/commits/v6.3.0 )
---
updated-dependencies:
- dependency-name: "@storybook/addon-knobs"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:54:52 -05:00
dependabot[bot]
f9deea3b8d
build(deps): bump core-js from 3.16.1 to 3.16.2 in /website/client ( #13461 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.16.1 to 3.16.2.
- [Release notes](https://github.com/zloirock/core-js/releases )
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zloirock/core-js/compare/v3.16.1...v3.16.2 )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:54:18 -05:00
Melior
c0bb10a82b
Merge branch 'origin/develop' into Weblate.
2021-08-24 22:46:48 +02:00
Sabe Jones
86d042034b
Merge branch 'release' into develop
2021-08-24 15:45:46 -05:00
Sabe Jones
e066c50774
chore(sprites): compile
2021-08-24 15:42:47 -05:00
Sabe Jones
48f1bec83a
feat(content): Time Traveler quest, achievement
2021-08-24 15:42:40 -05:00
Melior
d707070627
Translated using Weblate (Japanese)
...
Currently translated at 99.2% (126 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (47 of 47 strings)
Translation: Habitica/Contrib
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (206 of 206 strings)
Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hans/
Translated using Weblate (Chinese (Traditional))
Currently translated at 95.4% (699 of 732 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hant/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (732 of 732 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (732 of 732 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (189 of 189 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hant/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hant/
Translated using Weblate (Chinese (Traditional))
Currently translated at 99.6% (632 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hant/
Translated using Weblate (Japanese)
Currently translated at 96.0% (122 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Indonesian)
Currently translated at 83.4% (106 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/id/
Translated using Weblate (Italian)
Currently translated at 100.0% (2401 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translated using Weblate (Japanese)
Currently translated at 100.0% (186 of 186 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ja/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2401 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translated using Weblate (Japanese)
Currently translated at 94.4% (120 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Indonesian)
Currently translated at 88.1% (326 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/id/
Translated using Weblate (Indonesian)
Currently translated at 88.1% (326 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/id/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (111 of 111 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (131 of 131 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2401 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (203 of 203 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (102 of 102 strings)
Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/zh_Hans/
Translated using Weblate (Swedish)
Currently translated at 100.0% (54 of 54 strings)
Translation: Habitica/Defaulttasks
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/sv/
Translated using Weblate (Swedish)
Currently translated at 95.9% (355 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/sv/
Translated using Weblate (Japanese)
Currently translated at 92.9% (118 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Swedish)
Currently translated at 96.2% (129 of 134 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/sv/
Translated using Weblate (Swedish)
Currently translated at 100.0% (15 of 15 strings)
Translation: Habitica/Death
Translate-URL: https://translate.habitica.com/projects/habitica/death/sv/
Translated using Weblate (Chinese (Traditional))
Currently translated at 95.4% (699 of 732 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hant/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (732 of 732 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Indonesian)
Currently translated at 76.3% (97 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/id/
Translated using Weblate (Japanese)
Currently translated at 90.5% (115 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Indonesian)
Currently translated at 74.0% (94 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/id/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (134 of 134 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (374 of 374 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translated using Weblate (Spanish)
Currently translated at 100.0% (189 of 189 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (206 of 206 strings)
Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/es/
Translated using Weblate (Spanish)
Currently translated at 98.4% (721 of 732 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/es/
Translated using Weblate (Japanese)
Currently translated at 88.9% (113 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Japanese)
Currently translated at 88.9% (113 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Spanish)
Currently translated at 83.4% (106 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (634 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (634 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/es/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (111 of 111 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/pt_BR/
Translated using Weblate (Spanish)
Currently translated at 98.5% (625 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/es/
Translated using Weblate (Spanish)
Currently translated at 98.5% (625 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/es/
Translated using Weblate (Spanish)
Currently translated at 98.2% (623 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/es/
Translated using Weblate (Spanish)
Currently translated at 98.2% (623 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/es/
Translated using Weblate (French)
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/fr/
Translated using Weblate (Ukrainian)
Currently translated at 72.5% (1743 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2401 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translated using Weblate (Portuguese)
Currently translated at 72.7% (1746 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt/
Translated using Weblate (Indonesian)
Currently translated at 76.7% (43 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/id/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (127 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Japanese)
Currently translated at 85.0% (108 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hans/
Translated using Weblate (Portuguese)
Currently translated at 99.4% (368 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/pt/
Translated using Weblate (Japanese)
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ja/
Translated using Weblate (Italian)
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/it/
Translated using Weblate (Indonesian)
Currently translated at 100.0% (188 of 188 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/id/
Translated using Weblate (Portuguese)
Currently translated at 91.7% (582 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt/
Translated using Weblate (Indonesian)
Currently translated at 99.4% (185 of 186 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/id/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.2% (126 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.4% (125 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.6% (124 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.6% (124 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 96.0% (122 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 96.0% (122 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.2% (121 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.2% (121 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (634 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.7% (119 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.7% (119 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.9% (118 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.9% (118 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 91.3% (116 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 90.5% (115 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 89.7% (114 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 88.9% (113 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 88.1% (112 of 127 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2401 of 2401 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/pt_BR/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (111 of 111 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/zh_Hans/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.7% (369 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (634 of 634 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (370 of 370 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hans/
2021-08-24 22:25:30 +02:00