Sandipan
99429d9d48
Update LICENSE
...
Fixed grammatical error
2020-04-28 09:17:46 +05:30
Matteo Pagliazzi
6ffc28f04e
Merge pull request #12140 from benkelaar/regex-escape
...
Issue 12138 - Fix chat support for regex chars in code blocks
2020-04-27 20:24:27 +02:00
Bart Enkelaar
66ed0a350b
Issue 12138 - Fix chat support for regex chars in code blocks
2020-04-27 13:56:27 +02:00
Matteo Pagliazzi
6b2e9f16e2
build(deps): bump habitica-markdown in /website/client ( #12130 )
...
Bumps [habitica-markdown](https://github.com/HabitRPG/habitica-markdown ) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/HabitRPG/habitica-markdown/releases )
- [Commits](https://github.com/HabitRPG/habitica-markdown/compare/v1.3.2...v1.4.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-27 11:25:02 +02:00
dependabot-preview[bot]
7f6a2a0700
build(deps): bump habitica-markdown from 1.3.2 to 1.4.0 ( #12131 )
...
Bumps [habitica-markdown](https://github.com/HabitRPG/habitica-markdown ) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/HabitRPG/habitica-markdown/releases )
- [Commits](https://github.com/HabitRPG/habitica-markdown/compare/v1.3.2...v1.4.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-27 11:24:54 +02:00
dependabot-preview[bot]
05008b20d3
build(deps): bump mongoose from 5.9.9 to 5.9.10 ( #12137 )
...
Bumps [mongoose](https://github.com/Automattic/mongoose ) from 5.9.9 to 5.9.10.
- [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.9...5.9.10 )
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-27 11:24:46 +02:00
dependabot-preview[bot]
6cae168adb
build(deps): bump bootstrap-vue from 2.11.0 to 2.12.0 in /website/client ( #12128 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.11.0 to 2.12.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.11.0...v2.12.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-27 11:23:00 +02:00
dependabot-preview[bot]
72a9506b9f
build(deps): bump sass from 1.26.3 to 1.26.5 in /website/client ( #12129 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.3 to 1.26.5.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.26.3...1.26.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-27 11:22:47 +02:00
dependabot-preview[bot]
af96cd0488
build(deps): bump webpack from 4.42.1 to 4.43.0 in /website/client ( #12132 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.42.1 to 4.43.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.42.1...v4.43.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-27 11:22:12 +02:00
dependabot-preview[bot]
60204bef06
build(deps): bump csv-stringify from 5.3.6 to 5.4.3 ( #12135 )
...
Bumps [csv-stringify](https://github.com/adaltas/node-csv-stringify ) from 5.3.6 to 5.4.3.
- [Release notes](https://github.com/adaltas/node-csv-stringify/releases )
- [Changelog](https://github.com/adaltas/node-csv-stringify/blob/master/CHANGELOG.md )
- [Commits](https://github.com/adaltas/node-csv-stringify/compare/v5.3.6...v5.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-04-27 11:21:58 +02:00
dependabot-preview[bot]
4c21d9e560
build(deps): bump habitica-markdown in /website/client
...
Bumps [habitica-markdown](https://github.com/HabitRPG/habitica-markdown ) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/HabitRPG/habitica-markdown/releases )
- [Commits](https://github.com/HabitRPG/habitica-markdown/compare/v1.3.2...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 05:37:14 +00:00
Matteo Pagliazzi
d03e5e93b0
Merge branch 'release' into develop
2020-04-24 19:02:55 +02:00
Matteo Pagliazzi
c879560445
add ability to log amplitude events ( #12120 )
2020-04-24 19:02:27 +02:00
Bart Enkelaar
dc9800d88a
Don't bill (subtract gems) multiple times for multiple unlock item set calls ( #12116 )
...
* Issue 11050 - Small tuneups to unlock.js
- Use includes i.o. indexOf
- Extract small function for object setting duplication
- Use every instead of custom counter
* Issue 11050 - Properly store purchased items when purchasing them
* Issue 11050 - Couple more tuneups in unlock.js and implemented partial failure scenario
* Issue 11050 - Fix last lint issue
* Issue 11050 - Check path for gear i.o. failing to write it to purchased
* Issue 11050 - Guarantee variation coverage in tests
* Issue 11050 - Use startsWith instead of includes for background check
* Issue 11050 - Don't unlock lost items
2020-04-24 16:16:34 +02:00
Matteo Pagliazzi
39fcb3e876
Merge branch 'release' into develop
2020-04-24 12:06:31 +02:00
Matteo Pagliazzi
188023b197
fix #12118 : pass mandatory second parameter to markdown-it parse method
2020-04-24 12:06:05 +02:00
Matteo Pagliazzi
e47b0982c8
fix(i18n): remove loadingscreentips.json from non english folders
2020-04-23 23:25:25 +02:00
Melior
92f217775b
Merge branch 'origin/develop' into Weblate.
2020-04-23 21:02:15 +02:00
Melior
daf2c354d6
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (298 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/zh_Hans/
Translated using Weblate (Dutch)
Currently translated at 89.9% (1881 of 2091 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
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/
Translated using Weblate (Japanese)
Currently translated at 95.1% (236 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% (694 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (German)
Currently translated at 100.0% (694 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translated using Weblate (Japanese)
Currently translated at 92.7% (230 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% (694 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (German)
Currently translated at 100.0% (8 of 8 strings)
Translation: Habitica/Overview
Translate-URL: https://translate.habitica.com/projects/habitica/overview/de/
Translated using Weblate (German)
Currently translated at 100.0% (172 of 172 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/de/
Translated using Weblate (German)
Currently translated at 100.0% (492 of 492 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translated using Weblate (German)
Currently translated at 100.0% (2091 of 2091 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (German)
Currently translated at 100.0% (298 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/de/
Translated using Weblate (German)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/de/
Translated using Weblate (German)
Currently translated at 100.0% (522 of 522 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/de/
Translated using Weblate (Japanese)
Currently translated at 100.0% (143 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/ja/
Translated using Weblate (German)
Currently translated at 100.0% (143 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/de/
Translated using Weblate (Japanese)
Currently translated at 100.0% (8 of 8 strings)
Translation: Habitica/Overview
Translate-URL: https://translate.habitica.com/projects/habitica/overview/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 (German)
Currently translated at 100.0% (2091 of 2091 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (Dutch)
Currently translated at 96.3% (669 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/nl/
Translated using Weblate (German)
Currently translated at 100.0% (694 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (522 of 522 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (522 of 522 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (522 of 522 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translated using Weblate (English (Pirate))
Currently translated at 100.0% (143 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/en@pirate/
Translated using Weblate (English (Pirate))
Currently translated at 100.0% (358 of 358 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/en@pirate/
Translated using Weblate (English (Pirate))
Currently translated at 86.2% (69 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/en@pirate/
Translated using Weblate (Dutch)
Currently translated at 96.2% (668 of 694 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/nl/
Translated using Weblate (Dutch)
Currently translated at 100.0% (80 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/nl/
Translated using Weblate (Japanese)
Currently translated at 90.7% (127 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/ja/
Translated using Weblate (Swedish)
Currently translated at 93.0% (133 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/sv/
Translated using Weblate (Swedish)
Currently translated at 75.0% (60 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/sv/
Translated using Weblate (Russian)
Currently translated at 88.7% (71 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ru/
Translated using Weblate (Dutch)
Currently translated at 98.7% (79 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/nl/
Translated using Weblate (Japanese)
Currently translated at 100.0% (172 of 172 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translated using Weblate (Russian)
Currently translated at 97.2% (175 of 180 strings)
Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/
Translated using Weblate (Russian)
Currently translated at 99.7% (357 of 358 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ru/
Translated using Weblate (Russian)
Currently translated at 88.7% (71 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ru/
Translated using Weblate (German)
Currently translated at 100.0% (80 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/de/
Translated using Weblate (Dutch)
Currently translated at 96.2% (77 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/nl/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (80 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hant/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (80 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (80 of 80 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/en_GB/
2020-04-23 21:02:04 +02:00
Sabe Jones
c4343379a1
4.140.9
2020-04-23 13:59:54 -05:00
Sabe Jones
ce07d06c15
chore(news): Bailey
2020-04-23 13:59:48 -05:00
Matteo Pagliazzi
a0041221be
fix(webpack): correct typo in vue.config.js
2020-04-23 11:58:53 +02:00
Matteo Pagliazzi
ebfb6f96b3
Merge branch 'hamboomger-bugfix-extramonths-lost-when-subscription-terminated' into develop
2020-04-20 23:54:52 +02:00
Matteo Pagliazzi
22d696219a
Revert "Squashed commit of the following:"
...
This reverts commit 9014943a86
2020-04-20 23:53:41 +02:00
Matteo Pagliazzi
9014943a86
Squashed commit of the following:
...
commit 6a70487fa64fa381f15397209e40adb7448e2cfehttps://github.com/hamboomger/habitica into hamboomger-bugfix-extramonths-lost-when-subscription-terminated
commit b7448e2cfe0bc836b490fdf7e3a66500d12e83bd
2020-04-20 23:50:08 +02:00
Matteo Pagliazzi
6a70487fa6
remove un-needed code
2020-04-20 23:48:48 +02:00
Matteo Pagliazzi
4fa381f153
Merge branch 'bugfix-extramonths-lost-when-subscription-terminated' of https://github.com/hamboomger/habitica into hamboomger-bugfix-extramonths-lost-when-subscription-terminated
2020-04-20 23:30:19 +02:00
Matteo Pagliazzi
97209e40ad
Collection quests: make sure users cannot earn "excess" items ( #12098 )
...
* fix(collection quests): make sure users cannot earn "excess" collection items
* add test
2020-04-20 23:12:05 +02:00
Matteo Pagliazzi
2e97f9864e
fix(package.json): remove unused package
2020-04-20 22:27:20 +02:00
Jack Somers
6d6adfd919
Fixes #11119 : Added check for wacky pet before feeding ( #12106 )
...
* Added check for wacky pet before feeding
* added test for feeding wacky pets
* Fixed typo in test for feeding wacky pets
Co-authored-by: Jack Somers <somersjw9@gmail.com>
2020-04-20 22:17:42 +02:00
anoopravella
13123c0bae
Allow changing name of party without adding description ( #12095 )
...
* fixed behavior of editing parties, guilds
* removed unnecessary whitespace
* added v-if, removed v-once(s), simplified group type logic
2020-04-20 18:34:24 +02:00
Laurel Thomson
577e6f005e
Fixing the equipment popover message when equipment is from a different class - Fixes #11988 ( #11993 )
...
* Updating the equipment attributes popover to display the correct message when the equipment doesn't match the user's class
* Rewriting 'is wrong class' and abstracting logic into computed property of shop item
* Moving isWrongClass computed function from shopItem to popoverAttribute component
* Reverting accidental whitespace change
* Adding newline to end of profile.vue to get client to compile
* Reverting profile.vue back to develop branch
Co-authored-by: Laurel Thomson <laurel.beth.thomson@gmai.com>
2020-04-20 17:23:40 +02:00
Matteo Pagliazzi
1361fea2d4
Update year number on the footer component ( #12108 )
...
Happy belated new year :P
2020-04-20 16:36:52 +02:00
negue
cbcc7cd479
remove search from private-messages ( #12044 )
...
* remove search from private-messages + paged conversations + fixes
* remove autoSize call
* add conversation border at the top
* border-bottom under `Disable Private Messages` - revert border-bottom on conversation items
2020-04-20 16:32:54 +02:00
dependabot-preview[bot]
0e36c1aa0f
build(deps-dev): bump monk from 7.1.2 to 7.2.0 ( #12110 )
...
Bumps [monk](https://github.com/Automattic/monk ) from 7.1.2 to 7.2.0.
- [Release notes](https://github.com/Automattic/monk/releases )
- [Changelog](https://github.com/Automattic/monk/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Automattic/monk/commits/v7.2.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-20 11:45:48 +02:00
dependabot-preview[bot]
5b4505ac62
build(deps): bump jwks-rsa from 1.7.0 to 1.8.0 ( #12112 )
...
Bumps [jwks-rsa](https://github.com/auth0/node-jwks-rsa ) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/auth0/node-jwks-rsa/releases )
- [Changelog](https://github.com/auth0/node-jwks-rsa/blob/master/CHANGELOG.md )
- [Commits](https://github.com/auth0/node-jwks-rsa/compare/1.7.0...v1.8.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-20 11:44:53 +02:00
dependabot-preview[bot]
aa3d972cb4
build(deps): bump mongoose from 5.9.7 to 5.9.9 ( #12113 )
...
Bumps [mongoose](https://github.com/Automattic/mongoose ) from 5.9.7 to 5.9.9.
- [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.7...5.9.9 )
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-20 11:44:08 +02:00
Rarysson
d4b729c95e
Update year number on the footer component
...
Happy belated new year :P
2020-04-19 22:17:19 -03:00
Matteo Pagliazzi
d4b867acc3
fix(static overview): correctly scope css in apple redirect page to avoid polluting other pages
2020-04-19 12:29:30 +02:00
Matteo Pagliazzi
15c09691af
Merge branch 'release' into develop
2020-04-18 17:42:47 +02:00
Matteo Pagliazzi
27263e9b2f
4.140.8
2020-04-18 17:41:40 +02:00
Matteo Pagliazzi
2d9715b657
fix(apple auth): add needed env var to client and encode redirect url
2020-04-18 17:41:25 +02:00
Matteo Pagliazzi
8ca5ee99b0
Merge branch 'release' into develop
2020-04-18 16:09:40 +02:00
Matteo Pagliazzi
9f9da5632d
4.140.7
2020-04-18 16:02:23 +02:00
Matteo Pagliazzi
9364cdc2b4
fix(apple auth): do not try to parse name if it is missing, add query parameters to logs
2020-04-18 16:02:18 +02:00
Carl Vuorinen
2896cf77e0
Handle simultaneous quest accept/reject ( #12090 )
...
* Implement atomic quest accept/reject
* Persist quest.members early to avoid simultaneous handling of accept/reject
* Fix quest accept test (missing expectation)
* PR fixes
2020-04-17 22:57:31 +02:00
kareenf
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
Bart Enkelaar
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
kareenf
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
Sabe Jones
9706a9c8be
Merge branch 'release' into develop
2020-04-17 14:25:58 -05:00
