936d3ffc98
Delete merch page [ fixes #12039 ] ( #12094 )
...
* delete merch.vue and all mentions of links to merch page
* Added comments about why merch page is being deleted
Co-authored-by: Kareen <kareenf@umich.edu >
2020-04-17 22:55:22 +02:00
9608b9fa9f
Don't link user in markdown code blocks - Fixes #[11504] ( #12069 )
...
* Improve whitespacing in highlightMentions.js unit test
* Issue 11504 - Don't link users in markdown code blocks
Use the markdown-it parser to determine what parts of the message are code block first.
Then work from those parser tokens back to content parts that should not be handled.
Still convoluted, but can be improved once a "user mention plugin" is added to habitica-markdown.
* Issue 11504 - Put functions in JavaScript order and fix linting issues
* Issue 11504 - Use includes i.o. multiple or checks and added some context.
* Issue 11504 - Add docstring for highlightMentions and simplify fence regex
* Issue 11504 - Replace inline recursor with default parameter value
2020-04-17 22:19:11 +02:00
657327edd7
Fixes issue where usernames that are sandwiched with underscores are not properly formatted [ fixes #12033 ] ( #12071 )
...
* For some reason this file shows as modified, however I checked and it seems as though the same code chunk was 'deleted' and 'added' back in
* Added in logic to take care of issue pertaining to usernames with underscores such as @_spider_ was not showing up in the proper username format
* Added component test to test underscores in username issue
* I accidentally forgot to change the expected result to be @_user_
* Fixed strange spacing issue in profile.vue to match the original
* Another place where I needed to put _user_
* Accidentally left in describe.only in highlightUsers.spec.js,so removed .only
* Added in suggestions from @benkelaar and added in support for fixing double underscore sandwiched usernames which is Markdown's way of bolding
* Added component test to test that usernames sandwiched with double underscores are properly formatted
* Added fixes to test case input and variable mismatch in function
* Updated expect result statement to not be a user mention instance
Co-authored-by: Kareen <kareenf@umich.edu >
2020-04-17 21:45:01 +02:00
9706a9c8be
Merge branch 'release' into develop
2020-04-17 14:25:58 -05:00
484bae40cd
4.140.6
2020-04-17 14:24:42 -05:00
c0b6353ded
chore(analytics): change up drop tracking
2020-04-17 14:24:34 -05:00
f71062e86c
Merge branch 'release' into develop
2020-04-17 20:50:11 +02:00
8da36bf27c
4.140.5
2020-04-17 15:09:12 +02:00
1800fabaaa
Merge pull request #129 from HabitRPG/cache-fixes-3
...
API Cache fixes
2020-04-17 15:08:15 +02:00
193e7062c3
Merge branch 'release' into develop
2020-04-17 15:00:58 +02:00
cda5c6fbb0
res.header -> res.set
2020-04-17 14:57:53 +02:00
495d01f386
fix(static files): cache more static files ( #12102 )
2020-04-17 14:52:28 +02:00
24e1bfdfba
add basic test, disable etag on post routes as well, paypal ipn: prevent set headers after response error
2020-04-17 14:50:09 +02:00
f757e645b7
disable caching for the /status api route
2020-04-17 14:22:32 +02:00
bf492933cc
fix(cache): explicitly disable caching for most api routes
2020-04-17 14:22:20 +02:00
86d2fed76e
fix(apple auth): minor fixes, make sure apple auth users are considered when sending emails
2020-04-16 23:23:08 +02:00
2b7fe7c1d5
Merge branch 'origin/develop' into Weblate.
2020-04-16 22:19:38 +02:00
999b62df43
Translated using Weblate (Dutch)
...
Currently translated at 95.0% (76 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/nl/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (248 of 248 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% (172 of 172 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (298 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/
Translated using Weblate (Vietnamese)
Currently translated at 21.6% (31 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/vi/
Translated using Weblate (Vietnamese)
Currently translated at 11.1% (16 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/vi/
Translated using Weblate (Japanese)
Currently translated at 91.5% (227 of 248 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (126 of 126 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (230 of 230 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/zh_Hans/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (298 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/
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 (Portuguese (Brazil))
Currently translated at 100.0% (80 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/
Translated using Weblate (Dutch)
Currently translated at 90.0% (72 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/nl/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (134 of 134 strings)
Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 88.7% (71 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/
Translated using Weblate (French)
Currently translated at 100.0% (80 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (694 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
2020-04-16 22:19:26 +02:00
cc7dac47c4
4.140.4
2020-04-16 15:18:00 -05:00
c8189360d6
Merge branch 'develop' into release
2020-04-16 15:17:56 -05:00
88183149c5
chore(news): Bailey
2020-04-16 15:17:14 -05:00
a8f397c674
fix(join group): do not throw if inviter has does not exist
2020-04-15 21:43:24 +02:00
c5aeab652d
Push Notifications Fixes - Part 2 ( #12092 )
...
* push notifications: handle some more error codes and when the user is loaded using .lean()
* fix lint
* do not send push notification if message is missing
2020-04-15 21:36:53 +02:00
cc04761c24
Merge branch 'origin/develop' into Weblate.
2020-04-14 22:55:19 +02:00
29dccdd148
Translated using Weblate (Dutch)
...
Currently translated at 95.9% (666 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/nl/
Merge branch 'origin/develop' into Weblate.
Translated using Weblate (Swedish)
Currently translated at 95.0% (133 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/sv/
Translated using Weblate (German)
Currently translated at 99.7% (2086 of 2091 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (Romanian)
Currently translated at 100.0% (298 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/ro/
Translated using Weblate (Dutch)
Currently translated at 95.3% (662 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/nl/
Translated using Weblate (German)
Currently translated at 99.8% (693 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translated using Weblate (German)
Currently translated at 99.8% (693 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translated using Weblate (Romanian)
Currently translated at 100.0% (126 of 126 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ro/
Translated using Weblate (Japanese)
Currently translated at 100.0% (67 of 67 strings)
Translation: Habitica/Messages
Translate-URL: https://translate.habitica.com/projects/habitica/messages/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (492 of 492 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (298 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/ja/
Translated using Weblate (Romanian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ro/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (492 of 492 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt_BR/
Translated using Weblate (German)
Currently translated at 99.4% (2080 of 2091 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (Russian)
Currently translated at 99.5% (691 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translated using Weblate (Japanese)
Currently translated at 90.3% (224 of 248 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translated using Weblate (Russian)
Currently translated at 100.0% (140 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/ru/
Translated using Weblate (Dutch)
Currently translated at 100.0% (140 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/nl/
Translated using Weblate (Romanian)
Currently translated at 100.0% (8 of 8 strings)
Translation: Habitica/Overview
Translate-URL: https://translate.habitica.com/projects/habitica/overview/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (67 of 67 strings)
Translation: Habitica/Messages
Translate-URL: https://translate.habitica.com/projects/habitica/messages/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (31 of 31 strings)
Translation: Habitica/Maintenance
Translate-URL: https://translate.habitica.com/projects/habitica/maintenance/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ro/
Translated using Weblate (Romanian)
Currently translated at 100.0% (63 of 63 strings)
Translation: Habitica/Defaulttasks
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/ro/
Translated using Weblate (Russian)
Currently translated at 98.7% (685 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translated using Weblate (Dutch)
Currently translated at 94.6% (657 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/nl/
Translated using Weblate (French)
Currently translated at 100.0% (694 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/fr/
Translated using Weblate (French)
Currently translated at 100.0% (358 of 358 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/fr/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (694 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt_BR/
2020-04-14 22:55:14 +02:00
186b929e59
API-v4 route added: 'api/v4/faq' fixes #11801 ( #11905 )
...
* feat(api-v4): new /faq route added
* refactor(server): change of function name in libs/content.js
2020-04-14 22:14:53 +02:00
551abf292c
Removed loading screen tips, fixes #11834 ( #12063 )
...
* removed loading tip div
* removed loading tip number logic
* removed loadingScreenTips.json
2020-04-14 22:03:57 +02:00
1e1c058d82
Merge branch 'release' into develop
2020-04-14 14:50:46 -05:00
2ea9070a9b
4.140.3
2020-04-14 14:50:10 -05:00
168a3a6e89
Merge branch 'sabrecat/potion-time' into release
2020-04-14 14:49:18 -05:00
67bd2d9130
feat(content): enable spring avatar customizations
2020-04-14 14:49:11 -05:00
cb0280ca8b
fix(lint): move old migration to archive
2020-04-14 19:15:29 +02:00
259b15877b
chore(deps): remove unused aws-sdk file and dependency
2020-04-14 17:03:42 +02:00
dd31f559c7
onboarding guide improvements ( #12068 )
2020-04-13 16:19:46 +02:00
6c29ea8c4c
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client ( #12081 )
...
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.3.0 to 4.3.1.
- [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.1/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-13 14:53:29 +02:00
dc316ad1c8
build(deps): bump @vue/cli-plugin-eslint in /website/client ( #12076 )
...
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.3.0 to 4.3.1.
- [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.1/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-13 13:35:39 +02:00
a5b37fcc02
build(deps): bump @vue/cli-service in /website/client ( #12080 )
...
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.3.0 to 4.3.1.
- [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.1/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-13 13:31:25 +02:00
16f1c7286b
Merge pull request #12084 from HabitRPG/dependabot/npm_and_yarn/website/client/vue/cli-plugin-router-4.3.1
...
build(deps): bump @vue/cli-plugin-router from 4.3.0 to 4.3.1 in /website/client
2020-04-13 13:28:15 +02:00
d5b3e4ec9f
Merge pull request #12075 from HabitRPG/dependabot/npm_and_yarn/website/client/bootstrap-vue-2.11.0
...
build(deps): bump bootstrap-vue from 2.10.1 to 2.11.0 in /website/client
2020-04-13 13:27:53 +02:00
47eb9bf3ff
Merge pull request #12073 from HabitRPG/dependabot/npm_and_yarn/website/client/vue/cli-plugin-babel-4.3.1
...
build(deps): bump @vue/cli-plugin-babel from 4.3.0 to 4.3.1 in /website/client
2020-04-13 13:27:31 +02:00
2977346ccb
Merge pull request #12074 from HabitRPG/dependabot/npm_and_yarn/website/client/amplitude-js-5.11.0
...
build(deps): bump amplitude-js from 5.10.0 to 5.11.0 in /website/client
2020-04-13 13:27:23 +02:00
a545cc72d0
Merge pull request #12077 from HabitRPG/dependabot/npm_and_yarn/website/client/core-js-3.6.5
...
build(deps): bump core-js from 3.6.4 to 3.6.5 in /website/client
2020-04-13 13:27:08 +02:00
82548f69e5
Merge pull request #12078 from HabitRPG/dependabot/npm_and_yarn/website/client/jquery-3.5.0
...
build(deps): bump jquery from 3.4.1 to 3.5.0 in /website/client
2020-04-13 13:27:02 +02:00
5aacae3ead
build(deps): bump aws-sdk from 2.653.0 to 2.656.0 ( #12082 )
...
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js ) from 2.653.0 to 2.656.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.653.0...v2.656.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-13 13:25:56 +02:00
9f8162b82c
build(deps): bump @babel/preset-env from 7.9.0 to 7.9.5 ( #12087 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.9.0 to 7.9.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.9.0...v7.9.5 )
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-13 13:25:39 +02:00
98a749b239
build(deps): bump @vue/cli-plugin-router in /website/client
...
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.3.0 to 4.3.1.
- [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.1/packages/@vue/cli-plugin-router )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 05:30:11 +00:00
0cef9eff87
build(deps): bump aws-sdk from 2.653.0 to 2.656.0
...
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js ) from 2.653.0 to 2.656.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.653.0...v2.656.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 05:29:33 +00:00
3189a944d7
build(deps): bump jquery from 3.4.1 to 3.5.0 in /website/client
...
Bumps [jquery](https://github.com/jquery/jquery ) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 05:26:48 +00:00
79066165e2
build(deps): bump core-js from 3.6.4 to 3.6.5 in /website/client
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.6.4 to 3.6.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.6.4...v3.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 05:25:49 +00:00
c6f6df3f14
build(deps): bump bootstrap-vue from 2.10.1 to 2.11.0 in /website/client
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.10.1 to 2.11.0.
- [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.10.1...v2.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 05:23:51 +00:00
kareenf