71af306f02
4.140.0
2020-04-07 14:08:17 -05:00
5ccd2ae262
chore(event): seeds and sprites
2020-04-07 14:08:09 -05:00
a1a1fd939d
Merge branch 'sabrecat/dessert-potions' into release
2020-04-07 13:59:36 -05:00
9ac7840940
chore(winston-loggly-bulk): upgrade
2020-04-07 15:18:52 +02:00
100275f460
removed loading tip number logic
2020-04-06 17:20:40 -04:00
489b9c4019
removed loading tip div
2020-04-06 17:05:25 -04:00
ba61da4acb
fix(stable): wacky sorting
2020-04-06 15:26:43 -05:00
903851f1fd
fix(content): missing premium potion notes
2020-04-06 14:40:09 -05:00
371a1542e7
fix(content): feature items
2020-04-06 13:08:29 -05:00
0c640f07d1
fix(waffle): missing scroll
2020-04-06 12:19:40 -05:00
cbc6e7aa0c
Merge branch 'origin/develop' into Weblate.
2020-04-06 17:48:06 +02:00
b6eab67e6a
Merge branch 'release' into develop
2020-04-06 10:42:45 -05:00
99afefe953
4.139.0
2020-04-06 10:41:54 -05:00
9fea01b1f4
Merge branch 'sabrecat/armoire-202004' into release
2020-04-06 10:41:40 -05:00
978b78e57a
feat(migration): script for adding all gear to a user
2020-04-06 14:29:29 +00:00
f920a441a5
Translated using Weblate (Romanian)
...
Currently translated at 98.6% (227 of 230 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (36 of 36 strings)
Translation: Habitica/Loadingscreentips
Translate-URL: https://translate.habitica.com/projects/habitica/loadingscreentips/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ro/
Translated using Weblate (Dutch)
Currently translated at 99.5% (247 of 248 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/nl/
Translated using Weblate (Romanian)
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/ro/
Translated using Weblate (Dutch)
Currently translated at 100.0% (28 of 28 strings)
Translation: Habitica/Rebirth
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/nl/
Translated using Weblate (Dutch)
Currently translated at 100.0% (143 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/nl/
Translated using Weblate (Dutch)
Currently translated at 100.0% (8 of 8 strings)
Translation: Habitica/Overview
Translate-URL: https://translate.habitica.com/projects/habitica/overview/nl/
Translated using Weblate (Romanian)
Currently translated at 100.0% (12 of 12 strings)
Translation: Habitica/Merch
Translate-URL: https://translate.habitica.com/projects/habitica/merch/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (27 of 27 strings)
Translation: Habitica/Loginincentives
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/ro/
Translated using Weblate (Romanian)
Currently translated at 98.7% (324 of 328 strings)
Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (15 of 15 strings)
Translation: Habitica/Death
Translate-URL: https://translate.habitica.com/projects/habitica/death/ro/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (485 of 485 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translated using Weblate (Russian)
Currently translated at 99.3% (142 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/ru/
Translated using Weblate (Russian)
Currently translated at 96.1% (173 of 180 strings)
Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/
Translated using Weblate (Russian)
Currently translated at 97.9% (2042 of 2085 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2085 of 2085 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translated using Weblate (Russian)
Currently translated at 98.6% (508 of 515 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2085 of 2085 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% (685 of 685 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (143 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/pt_BR/
2020-04-06 13:53:15 +02:00
12a9eec540
build(deps): bump @vue/cli-plugin-eslint in /website/client ( #12054 )
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:34:51 +02:00
f83d86b7f3
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client ( #12058 )
...
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:34:41 +02:00
0410c97001
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.2.3 to 4.3.0.
- [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.3.0/packages/@vue/cli-plugin-eslint )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-06 09:33:11 +00:00
4482b734a5
build(deps): bump @vue/cli-plugin-router in /website/client ( #12056 )
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:30:38 +02:00
0131cc07bf
build(deps): bump @vue/cli-service in /website/client ( #12051 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:30:26 +02:00
70a9f66dcd
build(deps): bump @vue/cli-plugin-babel in /website/client ( #12049 )
...
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.2.3 to 4.3.0.
- [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.3.0/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-04-06 11:30:10 +02:00
3057fdbd4a
build(deps): bump @storybook/addon-links in /website/client ( #12047 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 5.3.17 to 5.3.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.18/addons/links )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-06 11:01:56 +02:00
cc48479c66
Merge branch 'release' into develop
2020-04-06 11:01:29 +02:00
8ad644ec3a
remove comment and improve logging
2020-04-06 10:57:36 +02:00
6f2bf5659d
improve emails errors
2020-04-06 10:56:39 +02:00
f4e573f684
build(deps): bump bootstrap-vue from 2.9.0 to 2.10.1 in /website/client ( #12050 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.9.0 to 2.10.1.
- [Release notes](https://github.com/bootstrap-vue/bootstrap-vue/releases )
- [Changelog](https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.9.0...v2.10.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-04-06 10:53:56 +02:00
a2e59d0920
build(deps): bump @storybook/addon-knobs in /website/client ( #12048 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs ) from 5.3.17 to 5.3.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.18/addons/knobs )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-06 10:53:48 +02:00
39fe86c688
build(deps): bump @storybook/addon-notes in /website/client ( #12046 )
...
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes ) from 5.3.17 to 5.3.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.18/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.18/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-04-06 10:53:38 +02:00
78ceb427a3
build(deps): bump @storybook/addon-actions in /website/client ( #12052 )
...
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions ) from 5.3.17 to 5.3.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.18/addons/actions )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-06 10:50:15 +02:00
7c17a32bbb
build(deps): bump @storybook/vue in /website/client ( #12057 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 5.3.17 to 5.3.18.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.18/app/vue )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-06 10:49:52 +02:00
9a34c16fa2
build(deps): bump aws-sdk from 2.648.0 to 2.653.0 ( #12061 )
...
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js ) from 2.648.0 to 2.653.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases )
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.648.0...v2.653.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-04-06 10:48:57 +02:00
38c24763fa
build(deps): bump mongoose from 5.9.6 to 5.9.7 ( #12062 )
...
Bumps [mongoose](https://github.com/Automattic/mongoose ) from 5.9.6 to 5.9.7.
- [Release notes](https://github.com/Automattic/mongoose/releases )
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md )
- [Commits](https://github.com/Automattic/mongoose/compare/5.9.6...5.9.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-06 10:48:17 +02:00
776f3d288b
Removed an unnecessary word in quest completion text
...
Changed "Great job catching the that would-be arsonist..." to "Great job catching that would-be arsonist..." in the quest completion text for "Bye, Bye, Butterfry."
2020-04-05 12:09:17 -05:00
b7448e2cfe
fix(server-api): cancelSubscription() is no longer called twice when user leaves group
2020-04-05 15:06:16 +03:00
0bc836b490
refactor(payments): unit tests created for calculation of subscription termination date
2020-04-05 15:06:16 +03:00
fdf7e3a665
fix(db-schema): typo fixed in group.hasCancelled() schema metod name
2020-04-05 15:06:16 +03:00
00d12e83bd
refactor(db-schema): group.isSubscribed() method name changed to group.hasActiveGroupPlan()
2020-04-05 15:06:16 +03:00
e4661c3763
Merge branch 'release' into develop
2020-04-04 13:49:59 +02:00
5fcf3fba88
4.138.6
2020-04-04 13:47:14 +02:00
156d15c540
Merge remote-tracking branch 'upstream/develop' into ptsFix
2020-04-04 16:29:34 +11:00
7d9b8a5ceb
use bootstrap native style rather than custom
2020-04-04 16:28:10 +11:00
23b19853b4
fix(image): filename
2020-04-03 20:36:31 -05:00
c6839c4478
fix(content): stray comma
2020-04-03 19:31:58 -05:00
167f4f07b8
feat(content): Confection Pets
2020-04-03 19:25:43 -05:00
95c9dbaa73
Merge branch 'release' into develop
2020-04-04 00:19:17 +02:00
c88af182c9
chore(deps): upgrade slack to v4
2020-04-04 00:19:00 +02:00
d9f7772453
chore(deps): upgrade slack to v4
2020-04-04 00:03:28 +02:00
931d8814b6
chore(sprites): compile
2020-04-03 15:41:49 -05:00
25e5183370
feat(content): Armoire/BGs 2020-04
2020-04-03 15:41:35 -05:00
Sabe Jones