e7fc7feddd
Better handling for cancellation when user had multiple subs
2022-11-04 13:30:50 +01:00
7fd899b642
Fix logic for apple subscriptions
2022-11-03 17:48:36 +01:00
164dbdcf10
Merge branch 'develop' into apple_sub_fix
2022-11-02 15:00:24 -05:00
f6e5360bdd
Merge branch 'release' into develop
2022-11-02 14:54:09 -05:00
eee8ad2029
fix(css): correct broken task creation dropdown on groups
2022-11-02 14:19:43 -05:00
ab953440e3
fix issue where subs would be applied multiple times
2022-11-02 16:36:09 +01:00
9b1a726875
Revert "feat(subs): allow upgrade/downgrade on iOS"
...
This reverts commit 27440772f0
2022-11-02 09:00:29 -05:00
9e98e56e9b
Allow sub upgrades/downgrades on iOS ( #14303 )
...
* Allow sub upgrades/downgrades on iOS
* fix check
* fix(lint): line length
* fix(typo): customER
* fix tests
* Implement correct handling for when subs are up/downgraded
* fix lint errors
* fix test
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-11-01 21:07:23 -05:00
6c85b1e047
chore(faq): update note on mobile Group Plans
2022-11-01 20:59:32 -05:00
7c553e535c
feat(gifting): restore ability to send gift messages
...
by @CuriousMagpie
2022-11-01 20:56:21 -05:00
c16207c9ba
Add Gift Messaging to Success Modal ( #14270 )
...
* initial commit: based on group-tracking-modal branch
* chore: merge group-tracking-modal
* update: create functions for each success condition
* chore: merge develop
* chore: work on successModal.vue & remove redundant code on groupPlan.vue
* update: remove `giftSubscriptionText4` from footer
* fix: correct groupPlan.vue file
* update: add messaging placeholder, clean up logic in a few places, update/add strings
* update: rearrange modal in order of display & test existence of 'gift-subscription' paymentType
* update: added props for receiverName so 'gift-subscription' works
* update: add close.svg & function
style: refactor CSS
* update: work on gift messaging
* update: work on gift messaging
* update: work on gift messaging
* update: let's make messages GO
* update: messages are a GO, we have LIFT OFF!
* fix: remove console log (oops)
Co-authored-by: SabreCat <sabe@habitica.com >
2022-11-01 20:55:40 -05:00
27440772f0
feat(subs): allow upgrade/downgrade on iOS
...
by @phillipthelen
2022-11-01 20:53:04 -05:00
aea0be3245
fix(subs): establish lock to prevent race condition
2022-11-01 20:47:21 -05:00
53fb28cc48
Merge branch 'origin/develop' into Weblate.
2022-10-31 20:27:10 +01:00
1c0710b45b
Merge branch 'release' into develop
2022-10-31 14:25:19 -05:00
3bc82a6692
chore(content): add Bone to Pick achievement ( #14318 )
...
* chore(content): add Bone to Pick achievement
* chore(content): update spritesmith-main.css
* chore(content): add more bone picking
* chore(content): more bone picking
* chore(content): bone picking
* chore(content): i gotta bone to pick here
* chore(content): final bone picking
* chore: add migration script
* chore: update habitica-images
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-31 14:19:56 -05:00
2add227b97
Translated using Weblate (Russian)
...
Currently translated at 100.0% (209 of 209 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (209 of 209 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (209 of 209 strings)
Translated using Weblate (Russian)
Currently translated at 99.8% (2698 of 2701 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2701 of 2701 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (2701 of 2701 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (732 of 732 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (732 of 732 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (732 of 732 strings)
Translated using Weblate (German)
Currently translated at 100.0% (209 of 209 strings)
Translated using Weblate (German)
Currently translated at 100.0% (2701 of 2701 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (209 of 209 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2701 of 2701 strings)
Translated using Weblate (German)
Currently translated at 99.8% (2696 of 2701 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (732 of 732 strings)
Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com >
Co-authored-by: LiziKnight <liziknight0316@outlook.com >
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com >
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com >
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com >
Co-authored-by: Weblate <noreply@weblate.org >
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/it/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/de/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/it/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hans/
Translation: Habitica/Backgrounds
Translation: Habitica/Gear
Translation: Habitica/Subscriber
2022-10-31 17:53:38 +01:00
e39a5a0628
fix(strings): set token typo
2022-10-30 20:15:37 -05:00
222ba544d7
Merge branch 'origin/develop' into Weblate.
2022-10-31 01:55:41 +01:00
2372efa22e
Merge branch 'release' into develop
2022-10-30 19:54:18 -05:00
b5c950ac96
chore(content): add November 2022 Mystery Items ( #14317 )
...
* chore(content): add November Mystery Items
* chore: merge release into 2022-11-mystery-items
* Revert "chore: merge release into 2022-11-mystery-items"
This reverts commit e12b61d73fsabe@habitica.com >
2022-10-30 19:52:55 -05:00
18ec3eb355
Translated using Weblate (Spanish)
...
Currently translated at 95.7% (2581 of 2695 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 87.1% (2350 of 2695 strings)
Translated using Weblate (Spanish)
Currently translated at 95.7% (2581 of 2695 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 87.0% (2347 of 2695 strings)
Translated using Weblate (Spanish)
Currently translated at 95.7% (2580 of 2695 strings)
Translated using Weblate (Spanish)
Currently translated at 95.7% (2580 of 2695 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 87.0% (2345 of 2695 strings)
Translated using Weblate (Ukrainian)
Currently translated at 24.0% (647 of 2695 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (403 of 403 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (Ukrainian)
Currently translated at 23.4% (632 of 2695 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.9% (2343 of 2695 strings)
Translated using Weblate (German)
Currently translated at 95.5% (385 of 403 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.8% (2341 of 2695 strings)
Translated using Weblate (German)
Currently translated at 94.7% (382 of 403 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.7% (2339 of 2695 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (214 of 214 strings)
Translated using Weblate (Polish)
Currently translated at 74.1% (43 of 58 strings)
Translated using Weblate (Polish)
Currently translated at 100.0% (47 of 47 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.7% (2337 of 2695 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Ukrainian)
Currently translated at 99.5% (401 of 403 strings)
Translated using Weblate (Ukrainian)
Currently translated at 22.9% (619 of 2695 strings)
Translated using Weblate (Russian)
Currently translated at 99.8% (2692 of 2695 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.6% (2335 of 2695 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.6% (2334 of 2695 strings)
Translated using Weblate (Spanish)
Currently translated at 95.7% (2580 of 2695 strings)
Translated using Weblate (German)
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (403 of 403 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (214 of 214 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (755 of 755 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Spanish)
Currently translated at 99.5% (233 of 234 strings)
Translated using Weblate (Spanish)
Currently translated at 95.7% (2580 of 2695 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (755 of 755 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.5% (2332 of 2695 strings)
Translated using Weblate (German)
Currently translated at 91.5% (369 of 403 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.1% (2322 of 2695 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (214 of 214 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (German)
Currently translated at 99.1% (232 of 234 strings)
Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com >
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com >
Co-authored-by: IvorTheBoneless <bohdanfiloenko657@gmail.com >
Co-authored-by: Lena Kubisa <lenorek.05.poczta@gmail.com >
Co-authored-by: LiziKnight <liziknight0316@outlook.com >
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com >
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com >
Co-authored-by: Sara López <sarayupy@gmail.com >
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com >
Co-authored-by: UNI <nibi727171@gmail.com >
Co-authored-by: Weblate <noreply@weblate.org >
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/de/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/es/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/es/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/es/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/it/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Npc
Translation: Habitica/Questscontent
Translation: Habitica/Settings
Translation: Habitica/Subscriber
2022-10-28 18:35:58 +02:00
0f3bc980d9
build(deps): bump smartbanner.js in /website/client ( #14313 )
...
Bumps [smartbanner.js](https://github.com/ain/smartbanner.js ) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/ain/smartbanner.js/releases )
- [Commits](https://github.com/ain/smartbanner.js/compare/v1.19.0...v1.19.1 )
---
updated-dependencies:
- dependency-name: smartbanner.js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-28 11:22:40 -04:00
7f87120d34
build(deps): bump core-js from 3.25.5 to 3.26.0 in /website/client ( #14314 )
...
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.25.5 to 3.26.0.
- [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/commits/v3.26.0/packages/core-js )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-28 11:22:19 -04:00
08469c556b
fix lint errors
2022-10-28 12:41:43 +02:00
13a25ad89e
Implement correct handling for when subs are up/downgraded
2022-10-28 11:23:48 +02:00
f7a03d2eb5
improve transactions logs + split createSubscription ( #14289 )
...
* improve transactions logs + split createSubscription
2022-10-27 08:39:06 +02:00
e6a7d15644
fix(typo): customER
2022-10-25 16:59:59 -05:00
6a4b08203f
fix(lint): line length
2022-10-25 16:52:16 -05:00
c9016c8d42
Merge branch 'develop' into phillip/sub_change
2022-10-25 16:47:51 -05:00
90250d1a25
Establish lock to avoid race scenario in subscriptions ( #14267 )
...
* fix(subscription): establish lock to avoid race scenario
* fix(lint): import syntax
* fix(lint): whitespace, dependency cycle
* fix(subs): skip locking on gifts and groups
* fix(subs): correctly reset _subSignature
* fix(sub): use findOneAndUpdate for unlock
* fix(test): save newly created user for some reason
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-25 16:44:33 -05:00
31685c3e94
fix check
2022-10-21 16:59:18 +02:00
c25b09c7ed
Allow sub upgrades/downgrades on iOS
2022-10-21 16:57:12 +02:00
a4326498d1
Group category update issue ( #14186 )
...
* Overwrite arrays instead of merging
* Test removing a category
* Fix previous duplicated categories on group edit
2022-10-12 15:51:56 -05:00
0b2cf5bceb
Fixes issue #14175 - Consolidate Challenge category options list to common file ( #14201 )
...
* Issue #14175 - Created a categoryOptions.js file in website/common/script/content to store list of category Options. Imported and added the list to website/client/src/components : challenges/challengeModal, challenges/sidebar, groups/groupFormModal, and groups/groupSidebar. This replaced the statically typed lists that previously existed. Tested the challengeModal and sidebar but unable to test the groups files due to credit card requirements. -@Tundrian
* Issue #14175 - Created a categoryOptions.js file in website/common/script/content to store list of category Options. Imported and added the list to website/client/src/components : challenges/challengeModal, challenges/sidebar, groups/groupFormModal, and groups/groupSidebar. This replaced the statically typed lists that previously existed. Tested the challengeModal and sidebar but unable to test the groups files due to credit card requirements. -@Tundrian
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-12 15:46:36 -05:00
f43a0d8289
Add checkmark to completed quests in shop ( #14269 )
...
* add 'completed' property to quest items
* show checkmark on completed quests in the shop
* add 'completed' property to quest items
* show checkmark on completed quests in the shop
2022-10-12 15:44:22 -05:00
39be8db4f9
build(deps): bump axios from 0.25.0 to 0.27.2 in /website/client ( #14007 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.25.0 to 0.27.2.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.25.0...v0.27.2 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 17:34:16 -05:00
f0a1f11a16
Merge branch 'release' into develop
2022-10-11 17:32:25 -05:00
84c4b3536c
build(deps): bump minimist, minimist and mkdirp in /website/client ( #14286 )
...
Bumps [minimist](https://github.com/minimistjs/minimist ), [minimist](https://github.com/minimistjs/minimist ) and [mkdirp](https://github.com/isaacs/node-mkdirp ). These dependencies needed to be updated together.
Updates `minimist` from 1.2.5 to 1.2.7
- [Release notes](https://github.com/minimistjs/minimist/releases )
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md )
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7 )
Updates `minimist` from 1.2.0 to 1.2.7
- [Release notes](https://github.com/minimistjs/minimist/releases )
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md )
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7 )
Updates `mkdirp` from 0.5.1 to 0.5.6
- [Release notes](https://github.com/isaacs/node-mkdirp/releases )
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/main/CHANGELOG.md )
- [Commits](https://github.com/isaacs/node-mkdirp/compare/0.5.1...v0.5.6 )
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
- dependency-name: minimist
dependency-type: indirect
- dependency-name: mkdirp
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 15:53:10 -05:00
cf834f57d7
build(deps): bump ansi-html and webpack-dev-server in /website/client ( #14285 )
...
Removes [ansi-html](https://github.com/Tjatse/ansi-html ). It's no longer used after updating ancestor dependency [webpack-dev-server](https://github.com/webpack/webpack-dev-server ). These dependencies need to be updated together.
Removes `ansi-html`
Updates `webpack-dev-server` from 3.11.2 to 3.11.3
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.3/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.2...v3.11.3 )
---
updated-dependencies:
- dependency-name: ansi-html
dependency-type: indirect
- dependency-name: webpack-dev-server
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 15:40:45 -05:00
0ec7784fb1
build(deps): bump @vue/cli-plugin-router in /website/client ( #14121 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.5.15 to 5.0.8.
- [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/v5.0.8/packages/@vue/cli-plugin-router )
---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-router"
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:59:32 -05:00
37791dfe8d
build(deps): bump intro.js from 5.1.0 to 6.0.0 in /website/client ( #14122 )
...
Bumps [intro.js](https://github.com/usablica/intro.js ) from 5.1.0 to 6.0.0.
- [Release notes](https://github.com/usablica/intro.js/releases )
- [Commits](https://github.com/usablica/intro.js/compare/v5.1.0...v6.0.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 >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:56:22 -05:00
cc39f6e4e9
build(deps): bump vue-router from 3.5.4 to 3.6.5 in /website/client ( #14228 )
...
Bumps [vue-router](https://github.com/vuejs/router ) from 3.5.4 to 3.6.5.
- [Release notes](https://github.com/vuejs/router/releases )
- [Commits](https://github.com/vuejs/router/commits )
---
updated-dependencies:
- dependency-name: vue-router
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:55:11 -05:00
452b516c67
build(deps): bump amplitude-js from 8.21.0 to 8.21.1 in /website/client ( #14248 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.21.0 to 8.21.1.
- [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.21.0...v8.21.1 )
---
updated-dependencies:
- dependency-name: amplitude-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:53:17 -05:00
e75610447f
build(deps): bump @hapi/hoek from 8.3.1 to 8.5.1 in /website/client ( #14255 )
...
Bumps [@hapi/hoek](https://github.com/hapijs/hoek ) from 8.3.1 to 8.5.1.
- [Release notes](https://github.com/hapijs/hoek/releases )
- [Commits](https://github.com/hapijs/hoek/compare/v8.3.1...v8.5.1 )
---
updated-dependencies:
- dependency-name: "@hapi/hoek"
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:51:37 -05:00
9d4f70371d
build(deps): bump core-js from 3.24.1 to 3.25.5 in /website/client ( #14282 )
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.24.1 to 3.25.5.
- [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.24.1...v3.25.5 )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-11 14:42:22 -05:00
18534a21ff
Merge branch 'develop' into release
2022-10-11 11:59:02 -05:00
ed0a36a287
Merge branch 'origin/develop' into Weblate.
2022-10-11 18:58:07 +02:00
e50f240366
Translated using Weblate (Polish)
...
Currently translated at 100.0% (127 of 127 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 86.0% (2319 of 2695 strings)
Translated using Weblate (German)
Currently translated at 99.5% (215 of 216 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (Spanish)
Currently translated at 95.0% (2562 of 2695 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (181 of 181 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (181 of 181 strings)
Translated using Weblate (Polish)
Currently translated at 100.0% (725 of 725 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (Polish)
Currently translated at 94.6% (686 of 725 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (403 of 403 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (58 of 58 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (58 of 58 strings)
Translated using Weblate (German)
Currently translated at 100.0% (755 of 755 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (47 of 47 strings)
Translated using Weblate (Spanish)
Currently translated at 95.0% (2562 of 2695 strings)
Translated using Weblate (French)
Currently translated at 97.2% (392 of 403 strings)
Translated using Weblate (German)
Currently translated at 91.3% (368 of 403 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (181 of 181 strings)
Translated using Weblate (German)
Currently translated at 98.2% (57 of 58 strings)
Translated using Weblate (German)
Currently translated at 100.0% (127 of 127 strings)
Translated using Weblate (Arabic)
Currently translated at 100.0% (181 of 181 strings)
Translated using Weblate (Arabic)
Currently translated at 90.3% (338 of 374 strings)
Translated using Weblate (Japanese)
Currently translated at 99.2% (130 of 131 strings)
Translated using Weblate (Japanese)
Currently translated at 99.5% (233 of 234 strings)
Translated using Weblate (Japanese)
Currently translated at 96.5% (389 of 403 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (French)
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (German)
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (Ukrainian)
Currently translated at 99.2% (130 of 131 strings)
Translated using Weblate (French)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (German)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (French)
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (Polish)
Currently translated at 83.5% (606 of 725 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (French)
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (403 of 403 strings)
Translated using Weblate (Russian)
Currently translated at 99.5% (215 of 216 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (755 of 755 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 92.3% (192 of 208 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 96.9% (127 of 131 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 89.7% (210 of 234 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 94.0% (379 of 403 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 95.0% (172 of 181 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (755 of 755 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (Japanese)
Currently translated at 99.1% (232 of 234 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (58 of 58 strings)
Translated using Weblate (Polish)
Currently translated at 80.4% (583 of 725 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (Japanese)
Currently translated at 99.1% (232 of 234 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (234 of 234 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (403 of 403 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (403 of 403 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (403 of 403 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (Russian)
Currently translated at 99.8% (2692 of 2695 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (German)
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (German)
Currently translated at 100.0% (2695 of 2695 strings)
Translated using Weblate (Russian)
Currently translated at 100.0% (755 of 755 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (755 of 755 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (127 of 127 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (127 of 127 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (374 of 374 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (374 of 374 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (186 of 186 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (725 of 725 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (725 of 725 strings)
Translated using Weblate (Polish)
Currently translated at 78.8% (572 of 725 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (140 of 140 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (140 of 140 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (216 of 216 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (127 of 127 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (127 of 127 strings)
Translated using Weblate (German)
Currently translated at 99.9% (2694 of 2695 strings)
Translated using Weblate (German)
Currently translated at 99.9% (2694 of 2695 strings)
Translated using Weblate (German)
Currently translated at 99.8% (2692 of 2695 strings)
Translated using Weblate (German)
Currently translated at 99.8% (2692 of 2695 strings)
Translated using Weblate (German)
Currently translated at 99.8% (2691 of 2695 strings)
Translated using Weblate (Arabic)
Currently translated at 89.8% (336 of 374 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (208 of 208 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2695 of 2695 strings)
Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com >
Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net >
Co-authored-by: Céu <marcel.ufscar@gmail.com >
Co-authored-by: Faris Allahham <farislahham@gmail.com >
Co-authored-by: Hexe des Windes (she/her) <krausanna1@gmail.com >
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com >
Co-authored-by: Lena Kubisa <lenorek.05.poczta@gmail.com >
Co-authored-by: LiziKnight <liziknight0316@outlook.com >
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com >
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com >
Co-authored-by: RedBug312 <redbug312@gmail.com >
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com >
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com >
Co-authored-by: UNI <nibi727171@gmail.com >
Co-authored-by: Weblate <noreply@weblate.org >
Co-authored-by: mattya 226 <worldworld1114@gmail.com >
Co-authored-by: そら <comi4work@gmail.com >
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/character/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/de/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/content/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/content/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/de/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/it/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/it/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/de/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/it/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/de/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/it/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/spells/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/de/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hant/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Character
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Npc
Translation: Habitica/Questscontent
Translation: Habitica/Settings
Translation: Habitica/Spells
Translation: Habitica/Subscriber
2022-10-11 18:57:30 +02:00
4d1bbdd8d0
chore(content): add October Backgrounds and Enchanted Armoire Items ( #14266 )
...
* chore(content): add October Backgrounds and Enchanted Armoire Items
* fix(typo): fix a couple of descriptions
* chore(subproject): update images
* fix(typo): keepin our caps consistent
* fix(typo): whitespace, caps
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-10-11 11:54:24 -05:00
Phillip Thelen