c879560445
add ability to log amplitude events ( #12120 )
2020-04-24 19:02:27 +02:00
188023b197
fix #12118 : pass mandatory second parameter to markdown-it parse method
2020-04-24 12:06:05 +02:00
c4343379a1
4.140.9
2020-04-23 13:59:54 -05:00
ce07d06c15
chore(news): Bailey
2020-04-23 13:59:48 -05:00
a0041221be
fix(webpack): correct typo in vue.config.js
2020-04-23 11:58:53 +02:00
ebfb6f96b3
Merge branch 'hamboomger-bugfix-extramonths-lost-when-subscription-terminated' into develop
2020-04-20 23:54:52 +02:00
22d696219a
Revert "Squashed commit of the following:"
...
This reverts commit 9014943a86
2020-04-20 23:53:41 +02:00
9014943a86
Squashed commit of the following:
...
commit 6a70487fa6matteopagliazzi@gmail.com >
Date: Mon Apr 20 23:48:48 2020 +0200
remove un-needed code
commit 4fa381f15397209e40adb7448e2cfematteopagliazzi@gmail.com >
Date: Mon Apr 20 23:30:19 2020 +0200
Merge branch 'bugfix-extramonths-lost-when-subscription-terminated' of https://github.com/hamboomger/habitica into hamboomger-bugfix-extramonths-lost-when-subscription-terminated
commit b7448e2cfehamboomger@gmail.com >
Date: Tue Mar 31 18:23:08 2020 +0300
fix(server-api): cancelSubscription() is no longer called twice when user leaves group
commit 0bc836b490hamboomger@gmail.com >
Date: Sun Mar 29 15:54:13 2020 +0300
refactor(payments): unit tests created for calculation of subscription termination date
commit fdf7e3a665hamboomger@gmail.com >
Date: Thu Mar 26 19:33:35 2020 +0200
fix(db-schema): typo fixed in group.hasCancelled() schema metod name
commit 00d12e83bdhamboomger@gmail.com >
Date: Thu Mar 26 19:31:07 2020 +0200
refactor(db-schema): group.isSubscribed() method name changed to group.hasActiveGroupPlan()
2020-04-20 23:50:08 +02:00
6a70487fa6
remove un-needed code
2020-04-20 23:48:48 +02:00
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
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
2e97f9864e
fix(package.json): remove unused package
2020-04-20 22:27:20 +02:00
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
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
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
1361fea2d4
Update year number on the footer component ( #12108 )
...
Happy belated new year :P
2020-04-20 16:36:52 +02:00
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
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
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
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
d4b729c95e
Update year number on the footer component
...
Happy belated new year :P
2020-04-19 22:17:19 -03:00
d4b867acc3
fix(static overview): correctly scope css in apple redirect page to avoid polluting other pages
2020-04-19 12:29:30 +02:00
15c09691af
Merge branch 'release' into develop
2020-04-18 17:42:47 +02:00
27263e9b2f
4.140.8
2020-04-18 17:41:40 +02:00
2d9715b657
fix(apple auth): add needed env var to client and encode redirect url
2020-04-18 17:41:25 +02:00
8ca5ee99b0
Merge branch 'release' into develop
2020-04-18 16:09:40 +02:00
9f9da5632d
4.140.7
2020-04-18 16:02:23 +02:00
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
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
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
Matteo Pagliazzi