Matteo Pagliazzi
e965f6a28f
Merge branch 'release' into develop
2020-09-05 13:10:57 +02:00
Sabe Jones
a91c2f7c7c
fix(settings): revert axios version due to account delete issue
2020-09-04 17:30:46 -05:00
Mike-Antonacci
5122d137b0
Change spellRogueStealthMaxedOut and spellAlreadyCast to a clearer wo… ( #12497 )
...
* Change spellRogueStealthMaxedOut and spellAlreadyCast to a clearer wording
* Restore package-lock.json and Delete string spellRogueStealthMaxedOut
* remove unused string, restore package-lock.json changes
* restore client package-lock.json
* Change spellRogueStealthMaxedOut and spellAlreadyCast to a clearer wording
* Restore package-lock.json and Delete string spellRogueStealthMaxedOut
* remove unused string, restore package-lock.json changes
* restore client package-lock.json
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-09-04 12:21:50 +02:00
Sabe Jones
b680b6026b
fix(teams): don't adjust source task value for rewards Fixes #12523
2020-09-03 10:00:32 -05:00
Matteo Pagliazzi
0c3b16ca74
fix(task modal): make sure task is loaded when template is shown
2020-09-03 16:33:44 +02:00
Melior
7be039a35f
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 99.7% (706 of 708 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (252 of 252 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (501 of 501 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2135 of 2135 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% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.2% (703 of 708 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (93 of 93 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/
Merge branch 'origin/develop' into Weblate.
Translated using Weblate (Italian)
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translated using Weblate (Dutch)
Currently translated at 99.8% (2127 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (French)
Currently translated at 100.0% (702 of 702 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/fr/
Translated using Weblate (French)
Currently translated at 100.0% (702 of 702 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/fr/
Translated using Weblate (French)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translated using Weblate (Greek)
Currently translated at 73.2% (41 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/el/
Translated using Weblate (Greek)
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/el/
Translated using Weblate (Greek)
Currently translated at 100.0% (6 of 6 strings)
Translation: Habitica/Inventory
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/el/
Translated using Weblate (Greek)
Currently translated at 79.8% (1702 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/el/
Translated using Weblate (Greek)
Currently translated at 100.0% (70 of 70 strings)
Translation: Habitica/Contrib
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/el/
Translated using Weblate (Greek)
Currently translated at 100.0% (4 of 4 strings)
Translation: Habitica/Noscript
Translate-URL: https://translate.habitica.com/projects/habitica/noscript/el/
Translated using Weblate (Greek)
Currently translated at 100.0% (27 of 27 strings)
Translation: Habitica/Loginincentives
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/el/
Translated using Weblate (Czech)
Currently translated at 88.9% (1895 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/
Translated using Weblate (French)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translated using Weblate (French)
Currently translated at 100.0% (702 of 702 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/fr/
Translated using Weblate (Russian)
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ru/
Translated using Weblate (Japanese)
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ja/
Translated using Weblate (Italian)
Currently translated at 100.0% (328 of 328 strings)
Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/it/
Translated using Weblate (Russian)
Currently translated at 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ru/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (English (Pirate))
Currently translated at 87.5% (7 of 8 strings)
Translation: Habitica/Overview
Translate-URL: https://translate.habitica.com/projects/habitica/overview/en@pirate/
Translated using Weblate (French)
Currently translated at 100.0% (500 of 500 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/fr/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translated using Weblate (French)
Currently translated at 100.0% (134 of 134 strings)
Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/fr/
Translated using Weblate (English (Pirate))
Currently translated at 85.8% (79 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/en@pirate/
Translated using Weblate (French)
Currently translated at 100.0% (500 of 500 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/fr/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (French)
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/fr/
Translated using Weblate (French)
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/fr/
Translated using Weblate (French)
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translated using Weblate (French)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/fr/
Translated using Weblate (French)
Currently translated at 100.0% (134 of 134 strings)
Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/fr/
Translated using Weblate (French)
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/fr/
Translated using Weblate (French)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/vi/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/vi/
Translated using Weblate (Vietnamese)
Currently translated at 82.5% (1760 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/vi/
Translated using Weblate (Latin)
Currently translated at 39.6% (25 of 63 strings)
Translation: Habitica/Defaulttasks
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/la/
Translated using Weblate (Russian)
Currently translated at 98.2% (56 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (146 of 146 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (298 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/ru/
Translated using Weblate (Russian)
Currently translated at 99.6% (548 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (212 of 212 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ru/
Translated using Weblate (Czech)
Currently translated at 100.0% (212 of 212 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/cs/
Translated using Weblate (English (Pirate))
Currently translated at 88.0% (191 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/en@pirate/
Translated using Weblate (Czech)
Currently translated at 88.3% (1883 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translated using Weblate (Japanese)
Currently translated at 91.0% (51 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translated using Weblate (Portuguese)
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translated using Weblate (Czech)
Currently translated at 86.7% (1849 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hant/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hant/
Translated using Weblate (Portuguese)
Currently translated at 87.2% (480 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/zh_Hant/
Translated using Weblate (Italian)
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/it/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/en_GB/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/zh_Hant/
Translated using Weblate (Italian)
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/it/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/en_GB/
Translated using Weblate (Czech)
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/cs/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (185 of 185 strings)
Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/
Translated using Weblate (Italian)
Currently translated at 100.0% (500 of 500 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/it/
Translated using Weblate (Turkish)
Currently translated at 80.0% (1706 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/tr/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2131 of 2131 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% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translated using Weblate (Italian)
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/en_GB/
Translated using Weblate (Italian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/it/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/en_GB/
Translated using Weblate (Italian)
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/it/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/en_GB/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hant/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/
Translated using Weblate (Italian)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/it/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/en_GB/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/zh_Hans/
Translated using Weblate (Russian)
Currently translated at 99.5% (216 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ru/
Translated using Weblate (German)
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/de/
Translated using Weblate (Russian)
Currently translated at 95.2% (239 of 251 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/zh_Hans/
Translated using Weblate (German)
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/de/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (146 of 146 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/zh_Hans/
Translated using Weblate (Russian)
Currently translated at 98.4% (492 of 500 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ru/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translated using Weblate (Russian)
Currently translated at 96.1% (2048 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2131 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translated using Weblate (German)
Currently translated at 99.8% (2128 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (Chinese (Simplified))
Currently translated at 92.8% (52 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translated using Weblate (Russian)
Currently translated at 94.6% (53 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ru/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/pt_BR/
Translated using Weblate (German)
Currently translated at 98.2% (55 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/de/
Translated using Weblate (Turkish)
Currently translated at 99.1% (228 of 230 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/tr/
Translated using Weblate (Turkish)
Currently translated at 99.1% (228 of 230 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/tr/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translated using Weblate (Russian)
Currently translated at 98.7% (543 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (550 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translated using Weblate (German)
Currently translated at 99.8% (549 of 550 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/de/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translated using Weblate (Russian)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ru/
Translated using Weblate (German)
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/de/
Translated using Weblate (Turkish)
Currently translated at 99.5% (229 of 230 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/tr/
2020-09-01 19:42:34 +02:00
Sabe Jones
01ae56f944
Merge branch 'release' into develop
2020-09-01 11:10:26 -05:00
Sabe Jones
ca413ff41a
chore(sprites): compile
2020-09-01 11:08:50 -05:00
Sabe Jones
81eef79da4
feat(content): Mystery Items and Challenges
2020-09-01 11:08:41 -05:00
negue
f1469b52f6
hotfix datepicker size
2020-08-31 23:13:31 +02:00
Matteo Pagliazzi
ef118f23c2
fix(loading): do not shift loading screen
2020-08-31 16:54:31 +02:00
dependabot-preview[bot]
32e9dbe1ed
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client ( #12513 )
...
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.5.3 to 4.5.4.
- [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.5.4/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>
2020-08-31 13:25:28 +02:00
dependabot-preview[bot]
466fb4e42e
build(deps): bump axios from 0.19.2 to 0.20.0 in /website/client ( #12516 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.2 to 0.20.0.
- [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.19.2...v0.20.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-08-31 13:24:47 +02:00
Matteo Pagliazzi
3bb8db45fd
build(deps): bump @vue/cli-plugin-eslint in /website/client ( #12510 )
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.5.3 to 4.5.4.
- [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.5.4/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>
2020-08-31 13:22:56 +02:00
dependabot-preview[bot]
181317dbff
build(deps): bump @vue/cli-plugin-eslint in /website/client
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.5.3 to 4.5.4.
- [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.5.4/packages/@vue/cli-plugin-eslint )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-31 11:22:44 +00:00
dependabot-preview[bot]
73a7ef8b2c
build(deps): bump vue and vue-template-compiler in /website/client ( #12511 )
...
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.11 to 2.6.12
- [Release notes](https://github.com/vuejs/vue/releases )
- [Commits](https://github.com/vuejs/vue/compare/v2.6.11...v2.6.12 )
Updates `vue-template-compiler` from 2.6.11 to 2.6.12
- [Release notes](https://github.com/vuejs/vue/releases )
- [Commits](https://github.com/vuejs/vue/compare/v2.6.11...v2.6.12 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-31 13:21:15 +02:00
dependabot-preview[bot]
206e3468f4
build(deps): bump vuedraggable from 2.24.0 to 2.24.1 in /website/client ( #12520 )
...
Bumps [vuedraggable](https://github.com/SortableJS/Vue.Draggable ) from 2.24.0 to 2.24.1.
- [Release notes](https://github.com/SortableJS/Vue.Draggable/releases )
- [Commits](https://github.com/SortableJS/Vue.Draggable/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-08-31 13:17:49 +02:00
dependabot-preview[bot]
77fde9d73f
build(deps): bump amplitude-js from 7.1.0 to 7.1.1 in /website/client ( #12517 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases )
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/master/CHANGELOG.md )
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v7.1.0...v7.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-31 13:17:25 +02:00
dependabot-preview[bot]
c1d4bcbac3
build(deps): bump @vue/cli-service in /website/client ( #12514 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.5.3 to 4.5.4.
- [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.5.4/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-08-31 13:17:05 +02:00
dependabot-preview[bot]
e98d0d88d9
build(deps): bump @storybook/addon-notes in /website/client ( #12512 )
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.19 to 5.3.21.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.21/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.21/addons/notes )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-31 13:16:39 +02:00
dependabot-preview[bot]
fc3a1dd93d
build(deps): bump @vue/cli-plugin-router in /website/client ( #12509 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.5.3 to 4.5.4.
- [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.5.4/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-08-31 13:16:07 +02:00
dependabot-preview[bot]
897155e4c8
build(deps): bump @vue/cli-plugin-babel in /website/client ( #12506 )
...
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.5.3 to 4.5.4.
- [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.5.4/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-08-31 13:15:55 +02:00
negue
aa1ea74daa
datepicker: add clear button ( #12480 )
...
* datepicker: add clear button
* use close icon instead of "x" as text
2020-08-29 17:22:31 +02:00
Bart Enkelaar
1b301e9c68
issue(11266) - Restyle level-up modal with sparkles ( #12486 )
...
* issue(11266) - Restyle level-up modal with sparkles
* issue(11266) - Add reward display to level up modal
At levels 15, 30, 40 and 60 the earned quests are now shown in the level-up modal.
* issue(11266) - Simplify css and don't use custom footer
* issue(11266) - Don't show pink bars and use colour variables
2020-08-29 16:33:06 +02:00
Matteo Pagliazzi
c00b2247d4
fix #12498 : do not score task when using a skill
2020-08-29 16:23:32 +02:00
Alys
88de5552a0
change blocked message
2020-08-29 18:03:59 +10:00
Sabe Jones
44e438303a
chore(news): Last Chance
2020-08-27 14:44:43 -05:00
Sabe Jones
7eeddcb033
Merge branch 'release' into develop
2020-08-25 16:05:40 -05:00
Sabe Jones
80ffcddb35
chore(sprites): compile
2020-08-25 16:04:35 -05:00
Sabe Jones
f4c453675b
feat(content): Wind-Up Potions quest
2020-08-25 16:04:28 -05:00
Alys
5165d491b0
fix some lint warnings ( #12488 )
...
* prevent some lint warnings by turning off some rules we don't seem to care about
require-prop-types has 167 violations
require-default-prop has 93 violations
* fix some lint warnings by adding eslint-disable-line comments
* prevent lint warnings by moving vue hooks to a different order
* apply some automatic lint fixes
* fix lint error by making line shorter
* prevent lint warnings from whitespace and @input, @click positioning
* revert 723fa38271
Reenables vue/require-prop-types and vue/require-default-prop
2020-08-25 18:06:39 +02:00
Sara Olson
6559353613
Update faq.json
...
some more android and ios faq changes
2020-08-25 18:01:37 +02:00
Matteo Pagliazzi
9caacc8f6c
fix(links): restore styles changed in bootstrap@4.5.1
2020-08-25 16:17:12 +02:00
Matteo Pagliazzi
d0bc0dbe49
Add API Call to bulk score tasks ( #11389 )
...
* Add new API call to complete multiple task scorings in one call
* Improve API response
* Improve saving process
* Improve handling for multiple tasks scored at once
* Handle challenge task errors better
* Improve check for alias
* Improve check for task scorings
* Fix merge errors
* make nodemon ignore content_cache
* Fix completing group tasks
* fix test
* fix tests (again)
* typo
* WIP(a11y): task modal updates
* fix(tasks): borders in modal
* fix(tasks): circley locks
* fix(task-modal): placeholders
* WIP(task-modal): disabled states, hide empty options, +/- restyle
* fix(task-modal): box shadows instead of borders, habit control pointer
* fix(task-modal): button states?
* fix(modal): tighten up layout, new spacing utils
* fix(tasks): more stylin
* fix(tasks): habit hovers
* fix(css): checklist labels, a11y colors
* fix(css): one more missed hover issue
* fix(css): lock Challenges, label fixes
* fix(css): scope input/textarea changes
* fix(style): task tweakies
* fix(style): more button fixage
* WIP(component): start select list story
* working example of a templated selectList
* fix(style): more button corrections
* fix(lint): EOL
* fix(buttons): factor btn-secondary to better override Bootstrap
* fix(styles): standardize more buttons
* wip: difficulty select - style fixes
* selectDifficulty works! 🎉 - fix styles
* change the dropdown-item sizes only for the selectList ones
* selectTranslatedArray
* changed many label margins
* more correct dropdown style
* fix(modals): button corrections
* input-group styling + datetime picker without today button
* Style/margins for "repeat every" - extract selectTag.vue
* working tag-selection / update - cleanup
* fix stories
* fix svg color on create modal (purple)
* fix task modal bottom padding
* correct dropdown shadow
* update dropdown-toggle caret size / color
* fixed checklist style
* sync checked state
* selectTag padding
* fix spacing between positive/negative streak inputs
* toggle-checkbox + fix some spacings
* disable repeat-on when its a groupTask
* fix new checklist-item
* fix toggle-checkbox style - fix difficulty style
* fix checklist ui
* add tags label , when there arent any tags selected
* WORKING select-tag component 🎉
* fix taglist story
* show max 5 items in tag dropdown + "X more" label
* fix datetime clear button
* replace m-b-xs to mb-1 (bootstrap) - fix input-group-text style
* fix styles of advanced settings
* fix delete task styles
* always show grippy on hover of the item
* extract modal-text-input mixin + fix the borders/dropshadow
* fix(spacing): revert most to Bootstrap
* feat(checklists): make local copy of master checklist non-editable
also aggressively update checklists because they weren't syncing??
* fix(checklists): handle add/remove options better
* feat(teams): manager notes field
* fix select/dropdown styles
* input border + icon colors
* delete task underline color
* fix checklist "delete icon" vertical position
* selectTag fixes - normal open/close toggle working again - remove icon color
* fixing icons:
Trash can - Delete
Little X - Remove
Big X - Close
Block - Block
* fix taglist margins / icon sizes
* wip margin overview (in storybook)
* fix routerlink
* remove unused method
* new selectTag style + add markdown inside tagList + scrollable tag selection
* fix selectTag / selectList active border
* fix difficulty select (svg default color)
* fix input padding-left + fix reset habit streak fullwidth / padding + "repeat every" gray text (no border)
* feat(teams): improved approval request > approve > reward flow
* fix(tests): address failures
* fix(lint): oops only
* fix(tasks): short-circuit group related logic
* fix(tasks): more short circuiting
* fix(tasks): more lines, less lint
* fix(tasks): how do i keep missing these
* feat(teams): provide assigning user summary
* fix(teams): don't attempt to record assiging user if not supplied
* fix advanced-settings styling / margin
* fix merge + hide advanced streak settings when none enabled
* fix styles
* set Roboto font for advanced settings
* Add Challenge flag to the tag list
* add tag with enter, when no other tag is found
* fix styles + tag cancel button
* refactor footer / margin
* split repeat fields into option mt-3 groups
* button all the things
* fix(tasks): style updates
* no hover state for non-editable tasks on team board
* keep assign/claim footer on task after requesting approval
* disable more fields on user copy of team task, and remove hover states
for them
* fix(tasks): functional revisions
* "Claim Rewards" instead of "x" in task approved notif
* Remove default transition supplied by Bootstrap, apply individually to
some elements
* Delete individual tasks and related notifications when master task
deleted from team board
* Manager notes now save when supplied at task initial creation
* Can no longer dismiss rewards from approved task by hitting Dismiss
All
* fix(tasks): clean tasksOrder
also adjust related test expectation
* fix(tests): adjust integration expectations
* fix(test): ratzen fratzen only
* fix lint
* fix tests
* fix(teams): checklist, notes
* handleSharedCompletion: handle error, make sure it is run after the user task has been saved
* fix typo
* correctly handle errors in handleSharedCompletion when approving a task
* fix(teams): improve disabled states
* handleSharedCompletion: do not increase completions by 1 manually to adjust for last approval not saved yet
* revert changes to config.json.example
* fix(teams): more style fixage
* add unit tests for findMultipleByIdOrAlias
* exclude api v4 route from apidocs
* BREAKING(teams): return 202 instead of 401 for approval request
* fix(teams): better taskboard sync
also re-re-fix checklist borders
* scoreTasks: validate body
* fix tests, move string to api errors
* fix(tests): update expectations for breaking change
* start updating api docs, process tasks sequentially to avoid conflicts with user._tmp
* do not crash entire bulk operation in case of errors
* save task only if modified
* fix lint
* undo changes to error handling: either all tasks scoring are successfull or none
* remove stale code
* do not return user._tmp when bulk scoring, it would be the last version only
* make sure user._tmp.leveledUp is not lost when bulk scoring
* rewards tests
* mixed tests
* fix tests, allow scoring the same task multiple times
* finish integration tests
* fix api docs for the bulk score route
* refactor(task-modal): lockable label component
* wip loading spinner
* refactor(teams): move task scoring to mixin
* fix(teams): style corrections
* fix(btn): fix padding to have height of 32px
* implement loading spinner
* remove console.log warnings
* fix(tasks): spacing and wording corrections
* fix(teams): don't bork manager notes
* fix(teams): assignment fix and more approval flow revisions
* WIP(teams): use tag dropdown control for assignment
* finish merge - never throw an error when a group task requires approval (wip - needs tests)
* fix taskModal merge
* fix merge
* fix(task modal): add newline
* fix(column.vue): add newline at end of file
* mvp yesterdaily modal
* fix tests
* fix api docs for bulk scoring group tasks
* separate task scoring and _tmp handling
* handle _tmp when bulk scoring
* rya: close modal before calling cron API, prevents issues with modals
* rya: fix conflicts with other modals
* add sounds, support for group plans, analytics
* use asyncResource for group plans
* fix lint
* streak bonus: add comment about missing in rya
* move yesterdailyModal
* fix issues with level up modals and rya
* add comments for future use, fix level up modals not showing up at levels with a quest drop
* handle errors in rya modal
* bundle quest and crit notifications
Co-authored-by: Phillip Thelen <phillip@habitica.com >
Co-authored-by: Phillip Thelen <viirus@pherth.net >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
Co-authored-by: negue <eugen.bolz@gmail.com >
2020-08-21 11:46:56 +02:00
Matteo Pagliazzi
46b5efcaf6
Allow group plans for private guilds only ( #12479 )
...
* hide upgrade button for public guilds
* prevent group plans for public guilds
* fix unit tests
* fix integration and unit tests that assumed group plans could be public guilds
* more unit tests fixes
* more resilient unit test
* more resilient unit test
2020-08-21 11:46:09 +02:00
Melior
633f3df372
Translated using Weblate (Turkish)
...
Currently translated at 96.3% (209 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/tr/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (217 of 217 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.9% (2130 of 2131 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.2% (55 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (92 of 92 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/
2020-08-20 22:45:40 +02:00
Sabe Jones
f9d9df5ddb
chore(news): blogs
2020-08-20 14:47:18 -05:00
Sabe Jones
8dbbfcd3a1
Scheduling summary line for team Dailies and To Do's ( #12439 )
...
* WIP(dailies): summary sentence draft
* fix(dailies): hide summarized fields, handle future Daily start date
* fix(dailies): don't apply summary sentence to Challenges
...for the sake of non-English users
* fix(dailies): tweak date x Challenge logic
* refactor(dailies): use native JS forEach
2020-08-20 14:12:05 -05:00
Matteo Pagliazzi
9a07ba7417
Better XSS Fix ( #12483 )
...
* Revert "fix(test): adjust expectations"
This reverts commit 205436d5b1 .
* Revert "fix(escaping): global inoffensive apostrophe"
This reverts commit 2b8f94b244 .
* change <%- to <%=
* fix interpolation only where necessary
* remove unused variable
2020-08-20 13:41:46 -05:00
Phillip Thelen
8248c4ca4e
Update faq.json ( #12484 )
2020-08-19 19:59:48 +02:00
Sabe Jones
0e9ac6d4f2
Merge branch 'release' into develop
2020-08-18 15:29:03 -05:00
Sabe Jones
eb16966953
fix(news): image
2020-08-18 15:26:54 -05:00
Sabe Jones
6255c5dcc7
feat(content): golden achievements
2020-08-18 15:13:06 -05:00
Alexander Colen
0cfe0473b9
Remove Tavern from API v3 list of guilds when 'guild' or 'publicGuilds' type parameter get added. ( Fixes #12407 ) ( #12438 )
...
* Excluding tavern from showing up in GET /groups API when 'guilds' or 'publicGuilds' type parameter is included.
* Fixed test errors.
* Resolved pull request #12438 issues.
Moved Tavern exclusion to Group model, removed Group controller back to the original and resolved test failures.
2020-08-17 12:38:07 +02:00
Matteo Pagliazzi
10f89c8d79
chore(vue deps): upgrade
2020-08-17 09:41:42 +02:00
dependabot-preview[bot]
4ac160ab21
build(deps): bump lodash from 4.17.19 to 4.17.20 in /website/client ( #12468 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.19 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.20 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-17 09:28:54 +02:00
dependabot-preview[bot]
dc5163e8a0
build(deps): bump vue-router from 3.4.2 to 3.4.3 in /website/client ( #12478 )
...
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.4.2 to 3.4.3.
- [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.4.2...v3.4.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-17 09:28:22 +02:00
Sabe Jones
2b8f94b244
fix(escaping): global inoffensive apostrophe
2020-08-15 10:27:37 -05:00
Sabe Jones
3a67a36031
fix(escaping): Armoire and boss messages
2020-08-14 11:04:21 -05:00
Sabe Jones
9d645c1c2e
fix(merge): missing string
2020-08-13 17:38:05 -05:00