Sabe Jones
8d9851a489
Merge branch 'release' into develop
2020-07-21 14:58:42 -05:00
Sabe Jones
c5e02292c4
feat(content): award yearly Orcas
2020-07-21 14:57:52 -05:00
Matteo Pagliazzi
fef9c74f9b
Merge branch 'release' into develop
2020-07-19 18:26:48 +02:00
Matteo Pagliazzi
fd7c5b3847
feat(members): allow to fetch up to 60 members at all ( #12400 )
2020-07-19 18:25:46 +02:00
Amber
ead0b6c56f
PR to fix: Disallow line breaks in display names ( #12380 )
...
* Update settings.json
* Update index.js
* Update validation.js
* Update validation.js
* Update validation.js
Removes the second check
* Update tests and validation
Added tests, and updated validation
2020-07-18 22:41:19 +02:00
Matteo Pagliazzi
9f85d3927f
fix(content): include app version in response
2020-07-18 15:36:44 +02:00
Matteo Pagliazzi
6743dcb08a
fix(cors): expose rate limit headers to clients
2020-07-18 15:00:23 +02:00
Matteo Pagliazzi
e7c8833c9a
API v3 Rate Limiter ( #12117 )
...
* simplify ip address management by using the trust proxy express option
* add setupExpress file
* fix redirects middleware tests
* fix lint
* short circuit the ip blocking middleware
* basic implementation with ip based limiting
* improve logging
* upgrade apidoc
* apidoc: add introduction section
* fix lint
* fix tests
* fix lint
* add unit tests for rate limiter
* do not send retry-after header when points are available
* automatically fix lint
* fix more lint issues
* use userId as key for rate limit when available
2020-07-18 15:00:09 +02:00
Sabe Jones
1b190a594a
chore(news): Bailey
2020-07-16 15:11:40 -05:00
Sabe Jones
e54bd8f242
Merge branch 'develop' into release
2020-07-16 14:58:25 -05:00
Sabe Jones
15753de3a1
feat(content): Seafoam and Amigos
2020-07-14 16:11:34 -05:00
Matteo Pagliazzi
c93bf3e498
MongoDB Transactions ( #12335 )
...
* add run-rs to dependencies
* wip: add replica set to api unit github action
* wip: add replica set to api unit github action
* wip: fix gh actions mongodb replica set setting
* usa replica set for integration tests
* add correct mongodb version matrix for integration tests
* use different db connection on gh actions
* Revert "use different db connection on gh actions"
This reverts commit aa8db759d380ba58ac90304c786b3eba5004b1bd.
* add example transaction
* add mongo script to package.json
* abstract mongodb utils, connect using hostname on windows
* npm scripts: mongo -> mongo:dev
* add setup script for run-rs on windows
* gh actions: run in test environment
* remove test files
* better error handling, use cross-spawn to avoid issues on windows
* fix lint
2020-07-14 18:55:47 +02:00
PitiTheGrey
e89ff95a21
Add Bulk Feed via query parameter ( #12384 )
...
* Update feed.js
New Tests for bulk feeding
* Update POST-user_feed_pet_food.test.js
Added test for bulk-feeding
* Update user.js
Added 'query paramter' for bulk feeding
* Update pets.json
Added "tooMuchFood" for bulk feeding pets
* Update feed.js
Added query parameter option for bulk feeding pets.
* Update feed.js
fixing lint
(bulk feeding)
* Update POST-user_feed_pet_food.test.js
adjustments for testing bulk feeding
* Update feed.js
Bulk feeding
amount as integer
* Update pets.json
added invalidAmount for bulk feeding
* Update feed.js
Bulk feeding
Error handling
* Update feed.js
Bulk - feed
no hardcoded values
* Update pets.json
Get rid of my german accent.
2020-07-13 16:04:03 +02:00
Jalansh
a02c4c1cfd
WIP. Accepting a redundant party invite will not remove the user from the party and let the user still be a part of it. Fixes #12291 . ( #12356 )
...
* Getting the latest code
* Temporary fix for Redundant Party Invite. Needs changes.
* Added logic to check if the user is an existing member of the party that the user is invited to.
* Added a test case for redundant party invite check.
* Changed the test case for redundant party invite to see if it runs successfully.
* Made changes to the test cases.
* Fixed lint errors.
* Removed the exclusive mocha test.
* Referred the issue in the name of the new test case.
* Modified test case to check its veracity.
* Checking if the update statement is working or not.
2020-07-13 16:00:34 +02:00
Matteo Pagliazzi
d861236f44
fix(cors): allow authorization header
2020-07-12 18:22:52 +02:00
Sabe Jones
955c41f744
Merge branch 'release' into develop
2020-07-07 14:53:52 -05:00
Sabe Jones
dc7b016950
chore(news): Bailey
2020-07-07 14:49:20 -05:00
tsukimi2
a388abc124
Added code to update user tag list along with the existing code that already involves updating the user documents of challenge members ( #12312 )
...
* Piggybacking the updating of user tag list.
When a new task is being added to a challenge, added code to update user tag list along with the existing code that already involves syncing / updating the user documents of challenge members.
* Update comment on number of simulatenaeous users to be updated concurrently in TaskQueue.
* Added comment to explain previous commit caaca469f8 (Update comment on number of simulateneous users to be updated concurrently in TaskQueue)
* Added unit tests for testing commit caaca469f8 (Update comment on number of simulateneous users to be updated concurrently in TaskQueue)
* Removed unused lines from newly added test cases
* Implemented lint suggestions
* Update code with changes requested in PR
2020-07-03 21:55:59 +02:00
JalanshMunshi
453d60b5bf
WIP. Changed the way how memberCount is incremented or decremented. Fixes #12275 ( #12308 )
...
* Changed the way how memberCount is incremented or decremented.
* Updated the logic for incrementing/decrementing memberCount for parties and guilds.
* Fixed lint errors
* Added relevant comment. Changed the way how memberCount is updated to replace the usage of custom query.
* Fixed lint errors.
* Reverted changes owing to failing tests.
* Added relevant comments. Removed duplicate and unwanted code. Added await for async function call.
* Minor change due to lint error.
* Reverted changes for removing the party member when the menber leaves.
2020-07-03 16:51:45 +02:00
Robert Whitaker
af1d13d3a2
Fix bug where updated webhook options failed to save ( fixes #12336 ) ( #12342 )
...
* Fix bug where updated webhook options failed to save
This bug was caused by Mongoose not creating getters/setters for array
elements (https://mongoosejs.com/docs/faq.html#array-changes-not-saved ).
So, although the webhook was being updated properly, Mongoose was not
actually committing it to the database. Telling Mongoose that the array
of webhooks has changed via `markModified` fixes the issue.
Additionally, the relevant API test case was only checking whether or
not the webhook returned from the PUT endpoint matched the expected
update. Since the endpoint was returning the updated webhook without
querying the database again, this test case would pass. It has been
updated to check both the returned webhook as well as the version of the
webhook that is saved to the database against the expected. In other
words:
`assert returned === saved === expected`
Fixes #12336
* Call markModified on webhook.options instead of user.webhooks
This tells Mongoose that only the modified webhook's options changed
instead of telling it that the entire user.webhooks array changed,
saving a costly DB update.
2020-07-03 16:48:45 +02:00
Sabe Jones
5a7e1cbc5a
Merge branch 'release' into develop
2020-07-01 16:37:22 -05:00
Sabe Jones
fb6eacf8f9
chore(news): Bailey
2020-07-01 16:36:51 -05:00
Matteo Pagliazzi
3d5630d5a2
chore: update sub-deps and fix lint
2020-07-01 18:20:18 +02:00
Sabe Jones
40cadba7bf
Merge branch 'release' into develop
2020-06-29 15:15:54 -05:00
Sabe Jones
2b166af82a
feat(content): July 2020 subscriber set
...
Also refactor repetitive subscriber item code
2020-06-29 15:15:11 -05:00
Ieahleen
083417fe48
added trasnformation items to api cast spell description ( #12340 )
2020-06-27 16:17:48 +02:00
Sabe Jones
ea255579cb
Merge branch 'release' into develop
2020-06-26 15:18:58 -05:00
Sabe Jones
b641414a56
fix(ABtest): record test group at registration
2020-06-26 15:16:22 -05:00
Matteo Pagliazzi
359ef47ce7
fix(get tasks): improve tests and add ability to fetch group tasks ( #12339 )
2020-06-26 16:50:49 +02:00
Matteo Pagliazzi
c7eae6f26b
fix(push notifications): always strip markdown from push notification text
2020-06-26 15:27:02 +02:00
Sabe Jones
2a85f2d27f
chore(news): Bailey
...
and set up A/B test for drop curve
2020-06-25 14:29:53 -05:00
Matteo Pagliazzi
a44aef3d9f
MongoDB 4.2 ( #12331 )
...
* use mongodb 4.2 in github actions
* use .countDocuments in place of .count
2020-06-25 16:50:57 +02:00
Matteo Pagliazzi
6058b3d4b4
Merge branch 'develop' of github.com:HabitRPG/habitica into develop
2020-06-25 16:07:25 +02:00
Matteo Pagliazzi
97857dbe9c
fix(apidoc): make sure v4 routes do not show up in docs
2020-06-25 16:07:03 +02:00
Tressley Cahill
b74d3343d1
Merge pull request #12314 from HabitRPG/hotfix/groups-checklist-toggle
...
Groups: always show checklist-toggle
2020-06-25 10:01:15 -04:00
negue
54a2ec1be8
enable collapseChecklist to be changed by everyone
2020-06-24 21:29:40 +02:00
Sabe Jones
52914ed17e
Merge branch 'release' into develop
2020-06-23 14:36:41 -05:00
Sabe Jones
e52fec08a0
feat(event): Splashy Skins
2020-06-23 14:30:39 -05:00
Matteo Pagliazzi
ba16fa6854
Upgrade Server Deps ( #12328 )
...
* upgrade uuid
* upgrade gulp-imagemin
* upgrade bcrypt
* upgrade validator.js
* fix uuid import
* upgrade got
* upgrade sinon
* upgrade passport-google-oauth2
* fix unit test
2020-06-22 11:51:52 +02:00
Sabe Jones
1405cf3ca5
Squashed commit of the following:
...
commit 39427a75db
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Wed Jun 17 17:33:30 2020 +0200
To-Dos -> To Do's (#12290 )
* To-Dos -> To Do's
* To-Do -> To Do
commit d7854f3809
Author: jacobguinther <jacobgguinther@gmail.com>
Date: Tue Jun 16 13:31:32 2020 -0600
Remove party banner when below tablet size (fixes 10827) (#12289 )
* Remove party banner when below tablet size
- Use Bootstrap breakpoints to remove party banner @ 768px
- Remove old media query that removed party button on small screens
* Make progress bars smaller @ 992px
- Makes room for party piece
commit 0d8df9f1a2
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jun 16 13:42:28 2020 -0500
More Armoire content refactoring (#12288 )
* refactor(armoire): still more defaultification
* fix(refactor): look at array for index, not object
* refactor(armoire): skip stat processing if item already has notes
commit 679c8f725b
Merge: 274a5f310e ed0cffce76
Author: Melior <admin@habitica.com>
Date: Tue Jun 16 20:39:36 2020 +0200
Merge branch 'origin/develop' into Weblate.
commit ed0cffce76
Author: Melior <admin@habitica.com>
Date: Tue Jun 16 20:39:25 2020 +0200
Translated using Weblate (Dutch)
Currently translated at 94.6% (2000 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Japanese)
Currently translated at 96.4% (677 of 702 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translated using Weblate (Dutch)
Currently translated at 94.6% (2000 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Japanese)
Currently translated at 97.5% (81 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (536 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (213 of 213 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% (2113 of 2113 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% (702 of 702 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% (359 of 359 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (536 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translated using Weblate (Vietnamese)
Currently translated at 97.0% (520 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Vietnamese)
Currently translated at 94.0% (504 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Japanese)
Currently translated at 100.0% (140 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (173 of 173 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ja/
Translated using Weblate (Russian)
Currently translated at 98.2% (690 of 702 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translated using Weblate (Japanese)
Currently translated at 95.4% (670 of 702 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (359 of 359 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (213 of 213 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (173 of 173 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (536 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (Japanese)
Currently translated at 95.1% (79 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translated using Weblate (Vietnamese)
Currently translated at 92.3% (495 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Romanian)
Currently translated at 100.0% (213 of 213 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ro/
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 (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 (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 (Russian)
Currently translated at 100.0% (143 of 143 strings)
Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (359 of 359 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ru/
Translated using Weblate (Japanese)
Currently translated at 99.6% (534 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (Russian)
Currently translated at 99.5% (210 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ru/
Translated using Weblate (Vietnamese)
Currently translated at 90.8% (487 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Japanese)
Currently translated at 98.8% (530 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (536 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translated using Weblate (Vietnamese)
Currently translated at 83.2% (446 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (213 of 213 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/vi/
Translated using Weblate (Dutch)
Currently translated at 94.4% (1996 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Japanese)
Currently translated at 95.4% (670 of 702 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (359 of 359 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ja/
Translated using Weblate (Japanese)
Currently translated at 98.3% (527 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
commit 274a5f310e
Merge: d961b8aaaf bceccd55bf
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jun 16 13:36:42 2020 -0500
Merge branch 'release' into develop
commit d961b8aaaf
Author: Frank Maximus <frank@healingjourneyman.com>
Date: Tue Jun 16 19:06:14 2020 +0200
#9498 : Hide Wolf-Veteran and LionCub-Ethereal (#12292 )
commit 430ff64875
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 15:12:39 2020 +0200
build(deps): bump @vue/cli-plugin-eslint in /website/client (#12301 )
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint ) from 4.4.1 to 4.4.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.4.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>
commit ac99c6c3c5
Merge: 1be03d741a a43f410031
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Tue Jun 16 15:04:30 2020 +0200
build(deps): bump @vue/cli-service in /website/client (#12305 )
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.4.1 to 4.4.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.4.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>
commit 1be03d741a
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 15:04:13 2020 +0200
build(deps): bump @vue/cli-plugin-router in /website/client (#12304 )
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router ) from 4.4.1 to 4.4.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.4.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>
commit a43f410031
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 13:00:43 2020 +0000
build(deps): bump @vue/cli-service in /website/client
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service ) from 4.4.1 to 4.4.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.4.4/packages/@vue/cli-service )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
commit b84395b17d
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 14:58:02 2020 +0200
build(deps): bump vue-router from 3.3.2 to 3.3.4 in /website/client (#12306 )
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.3.2 to 3.3.4.
- [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.3.2...v3.3.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
commit d5d4afe613
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 14:57:43 2020 +0200
build(deps): bump @vue/cli-plugin-unit-mocha in /website/client (#12303 )
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ) from 4.4.1 to 4.4.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.4.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>
commit def62d5716
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 14:57:37 2020 +0200
build(deps): bump habitica-markdown in /website/client (#12302 )
Bumps [habitica-markdown](https://github.com/HabitRPG/habitica-markdown ) from 2.0.0 to 2.0.2.
- [Release notes](https://github.com/HabitRPG/habitica-markdown/releases )
- [Commits](https://github.com/HabitRPG/habitica-markdown/commits/v2.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
commit 5846898592
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 14:57:25 2020 +0200
build(deps): bump @vue/cli-plugin-babel in /website/client (#12299 )
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.4.1 to 4.4.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.4.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>
commit 524aac4d95
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue Jun 16 14:57:11 2020 +0200
build(deps): bump helmet from 3.22.0 to 3.23.0 (#12297 )
Bumps [helmet](https://github.com/helmetjs/helmet ) from 3.22.0 to 3.23.0.
- [Release notes](https://github.com/helmetjs/helmet/releases )
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/helmetjs/helmet/compare/v3.22.0...v3.23.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
commit 92dc332ab9
Merge: 7902db2edc bcd3e2851c
Author: Melior <admin@habitica.com>
Date: Fri Jun 12 00:02:52 2020 +0200
Merge branch 'origin/develop' into Weblate.
commit 7902db2edc
Merge: f3ea5f0b62 e6b65871e7
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Jun 11 16:38:48 2020 -0500
Merge branch 'release' into develop
commit f3ea5f0b62
Author: negue <negue@users.noreply.github.com>
Date: Thu Jun 11 21:14:33 2020 +0200
Tasks Redesign: Colors, Title, Notes, Habit Controls, Button Style (#12274 )
* extract color changes + habit-controls out of #12142
* extract title / notes changes from #12142
* extracted delete btn + style fixes of #12142
* fix taskModal footer + advancedSettings
* extracted the button style changes from #12142
* remove un-used method
commit bcd3e2851c
Author: Melior <admin@habitica.com>
Date: Thu Jun 11 20:46:57 2020 +0200
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (83 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/vi/
Translated using Weblate (Latin)
Currently translated at 85.5% (71 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/la/
Translated using Weblate (Russian)
Currently translated at 97.3% (2056 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translated using Weblate (German)
Currently translated at 99.8% (2110 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (Russian)
Currently translated at 99.4% (533 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translated using Weblate (Japanese)
Currently translated at 97.9% (525 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (German)
Currently translated at 99.6% (534 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/de/
Translated using Weblate (Catalan)
Currently translated at 100.0% (4 of 4 strings)
Translation: Habitica/Noscript
Translate-URL: https://translate.habitica.com/projects/habitica/noscript/ca/
Translated using Weblate (Catalan)
Currently translated at 100.0% (12 of 12 strings)
Translation: Habitica/Merch
Translate-URL: https://translate.habitica.com/projects/habitica/merch/ca/
Translated using Weblate (Catalan)
Currently translated at 100.0% (230 of 230 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/ca/
Translated using Weblate (Vietnamese)
Currently translated at 80.9% (434 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (Catalan)
Currently translated at 100.0% (28 of 28 strings)
Translation: Habitica/Rebirth
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/ca/
Translated using Weblate (Catalan)
Currently translated at 100.0% (31 of 31 strings)
Translation: Habitica/Maintenance
Translate-URL: https://translate.habitica.com/projects/habitica/maintenance/ca/
Translated using Weblate (Catalan)
Currently translated at 100.0% (27 of 27 strings)
Translation: Habitica/Loginincentives
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/ca/
Translated using Weblate (Catalan)
Currently translated at 100.0% (6 of 6 strings)
Translation: Habitica/Inventory
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/ca/
Translated using Weblate (Catalan)
Currently translated at 82.3% (1740 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ca/
Translated using Weblate (Catalan)
Currently translated at 100.0% (63 of 63 strings)
Translation: Habitica/Defaulttasks
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/ca/
Translated using Weblate (Catalan)
Currently translated at 100.0% (15 of 15 strings)
Translation: Habitica/Death
Translate-URL: https://translate.habitica.com/projects/habitica/death/ca/
Translated using Weblate (Catalan)
Currently translated at 99.1% (123 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ca/
Translated using Weblate (Portuguese)
Currently translated at 83.0% (1754 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt/
Translated using Weblate (Portuguese)
Currently translated at 83.0% (1754 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt/
Translated using Weblate (French)
Currently translated at 100.0% (2113 of 2113 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translated using Weblate (Russian)
Currently translated at 98.8% (530 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translated using Weblate (Japanese)
Currently translated at 97.5% (523 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (French)
Currently translated at 100.0% (536 of 536 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/fr/
Translated using Weblate (Spanish)
Currently translated at 94.6% (53 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/es/
Translated using Weblate (Spanish)
Currently translated at 99.1% (123 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/es/
Translated using Weblate (Spanish)
Currently translated at 97.1% (205 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/es/
commit 5957930709
Author: Frank Maximus <frank@healingjourneyman.com>
Date: Wed Jun 10 15:01:07 2020 +0200
Display descriptive error when mongod isn't running (#12196 )
Add test:prepare:mongo task to check is mongod is running.
Fixes : #12101
commit 1df4e687f1
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Wed Jun 10 14:57:57 2020 +0200
fix(mentions): do not fill empty mentions with following username, fixes #12272
commit 3063a38d60
Merge: 4b489fe4ca 51d20ef7e8
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jun 9 15:28:16 2020 -0500
Merge branch 'release' into develop
commit 4b489fe4ca
Merge: afd50ddc2d 074004ec75
Author: Melior <admin@habitica.com>
Date: Tue Jun 9 21:21:14 2020 +0200
Merge branch 'origin/develop' into Weblate.
commit 074004ec75
Author: Melior <admin@habitica.com>
Date: Tue Jun 9 21:21:04 2020 +0200
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (249 of 249 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% (140 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/pt_BR/
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (173 of 173 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% (493 of 493 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% (2107 of 2107 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 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt_BR/
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 (Japanese)
Currently translated at 100.0% (140 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (493 of 493 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translated using Weblate (Dutch)
Currently translated at 94.6% (1994 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Japanese)
Currently translated at 98.2% (520 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (Catalan)
Currently translated at 92.0% (487 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ca/
Translated using Weblate (Russian)
Currently translated at 93.9% (234 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translated using Weblate (Russian)
Currently translated at 97.4% (2053 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (522 of 522 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translated using Weblate (French)
Currently translated at 100.0% (140 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/fr/
Translated using Weblate (French)
Currently translated at 100.0% (173 of 173 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/fr/
Translated using Weblate (French)
Currently translated at 100.0% (493 of 493 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/fr/
Translated using Weblate (Russian)
Currently translated at 99.2% (518 of 522 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translated using Weblate (Vietnamese)
Currently translated at 80.7% (427 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/vi/
Translated using Weblate (German)
Currently translated at 100.0% (140 of 140 strings)
Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/de/
Translated using Weblate (German)
Currently translated at 100.0% (173 of 173 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/de/
Translated using Weblate (German)
Currently translated at 100.0% (493 of 493 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
commit afd50ddc2d
Merge: 61ca500013 e31ce11052
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jun 9 14:17:53 2020 -0500
Merge branch 'release' into develop
commit 61ca500013
Merge: 9ab79ef225 630c848ff5
Author: Melior <admin@habitica.com>
Date: Mon Jun 8 21:50:11 2020 +0200
Merge branch 'origin/develop' into Weblate.
commit 630c848ff5
Author: Melior <admin@habitica.com>
Date: Mon Jun 8 16:37:50 2020 +0200
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/vi/
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/vi/
Translated using Weblate (Russian)
Currently translated at 93.5% (233 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translated using Weblate (Russian)
Currently translated at 97.2% (2049 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translated using Weblate (Dutch)
Currently translated at 94.6% (1994 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Japanese)
Currently translated at 97.9% (518 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (696 of 696 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Japanese)
Currently translated at 97.5% (516 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
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 (Japanese)
Currently translated at 97.1% (514 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (Dutch)
Currently translated at 94.5% (1992 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (German)
Currently translated at 100.0% (249 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/de/
Translated using Weblate (German)
Currently translated at 100.0% (2107 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (Japanese)
Currently translated at 96.7% (512 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (German)
Currently translated at 99.9% (2105 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translated using Weblate (Japanese)
Currently translated at 96.4% (510 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translated using Weblate (Dutch)
Currently translated at 94.4% (1990 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Dutch)
Currently translated at 94.4% (1990 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
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 (Russian)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (57 of 57 strings)
Translation: Habitica/Spells
Translate-URL: https://translate.habitica.com/projects/habitica/spells/ru/
Translated using Weblate (Russian)
Currently translated at 97.6% (168 of 172 strings)
Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ru/
Translated using Weblate (Russian)
Currently translated at 98.3% (178 of 181 strings)
Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (492 of 492 strings)
Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ru/
Translated using Weblate (Russian)
Currently translated at 96.6% (2037 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translated using Weblate (Russian)
Currently translated at 99.6% (297 of 298 strings)
Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (328 of 328 strings)
Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/ru/
Translated using Weblate (Russian)
Currently translated at 98.2% (55 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (15 of 15 strings)
Translation: Habitica/Death
Translate-URL: https://translate.habitica.com/projects/habitica/death/ru/
Translated using Weblate (Russian)
Currently translated at 99.1% (690 of 696 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translated using Weblate (German)
Currently translated at 100.0% (696 of 696 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translated using Weblate (Russian)
Currently translated at 100.0% (126 of 126 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (70 of 70 strings)
Translation: Habitica/Contrib
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (230 of 230 strings)
Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (134 of 134 strings)
Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/ru/
Translated using Weblate (Russian)
Currently translated at 99.0% (209 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ru/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2107 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translated using Weblate (Polish)
Currently translated at 83.6% (1763 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pl/
Translated using Weblate (Dutch)
Currently translated at 94.3% (1989 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (696 of 696 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Vietnamese)
Currently translated at 96.4% (54 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/vi/
Translated using Weblate (Vietnamese)
Currently translated at 90.3% (75 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/vi/
Translated using Weblate (Russian)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ru/
Translated using Weblate (Russian)
Currently translated at 99.2% (691 of 696 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translated using Weblate (Russian)
Currently translated at 100.0% (134 of 134 strings)
Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/ru/
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 (Dutch)
Currently translated at 94.3% (1987 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (249 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hant/
Translated using Weblate (Dutch)
Currently translated at 100.0% (249 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/nl/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (249 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/en_GB/
Translated using Weblate (Dutch)
Currently translated at 100.0% (181 of 181 strings)
Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/nl/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2107 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translated using Weblate (Dutch)
Currently translated at 94.2% (1985 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Spanish)
Currently translated at 91.4% (1927 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2107 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/en_GB/
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 (Dutch)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/nl/
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 (Chinese (Simplified))
Currently translated at 100.0% (696 of 696 strings)
Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/zh_Hant/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/en_GB/
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/zh_Hant/
Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/en_GB/
Translated using Weblate (Vietnamese)
Currently translated at 85.5% (71 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/vi/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (83 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
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 (Japanese)
Currently translated at 100.0% (328 of 328 strings)
Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/ja/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (249 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2107 of 2107 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% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/zh_Hans/
Translated using Weblate (Chinese (Simplified))
Currently translated at 99.3% (2094 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translated using Weblate (French)
Currently translated at 100.0% (249 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/fr/
Translated using Weblate (French)
Currently translated at 100.0% (2107 of 2107 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% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/fr/
Translated using Weblate (Spanish)
Currently translated at 99.7% (357 of 358 strings)
Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/es/
Translated using Weblate (French)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/fr/
Translated using Weblate (Japanese)
Currently translated at 100.0% (249 of 249 strings)
Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (28 of 28 strings)
Translation: Habitica/Rebirth
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/ja/
Translated using Weblate (Dutch)
Currently translated at 94.1% (1983 of 2107 strings)
Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/
Translated using Weblate (Dutch)
Currently translated at 100.0% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/nl/
Translated using Weblate (Dutch)
Currently translated at 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/nl/
Translated using Weblate (Japanese)
Currently translated at 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (78 of 78 strings)
Translation: Habitica/Contrib
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/ja/
Translated using Weblate (Dutch)
Currently translated at 100.0% (83 of 83 strings)
Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/nl/
Translated using Weblate (Dutch)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/nl/
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% (56 of 56 strings)
Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ja/
Translated using Weblate (Japanese)
Currently translated at 100.0% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translated using Weblate (Japanese)
Currently translated at 96.0% (508 of 529 strings)
Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
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% (124 of 124 strings)
Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/de/
Translated using Weblate (German)
Currently translated at 100.0% (211 of 211 strings)
Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/de/
2020-06-18 13:29:30 -05:00
Sabe Jones
048b60f79d
chore(news): Bailey
...
and some seasonal string tweaks
2020-06-18 13:25:56 -05:00
Sabe Jones
5cd9528b77
Squashed commit of the following:
...
commit 24e299b4663d77daf70c5cca584d27db2df94fe6
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Jun 18 12:29:07 2020 -0500
fix(gear): Mage Oar is twohanded and grants PER
commit 4f92312b7f409419c37f9f97bc162153ad3103b5
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Jun 18 12:27:27 2020 -0500
fix(sprites): corrected Mage set
commit 49d86ca8879b66e3531be81d35e6e98916185486
Author: Sabe Jones <sabrecat@gmail.com>
Date: Wed Jun 17 16:16:56 2020 -0500
refactor(strings): finish cleaning up redundant seasonal Rogue strings
commit ee513cc1449c52ad72850745ea18a353be5490d2
Author: Sabe Jones <sabrecat@gmail.com>
Date: Wed Jun 17 16:09:12 2020 -0500
chore(sprites): compile
commit 0b15f834a000a033925571ff5a15871b0965bc00
Author: Sabe Jones <sabrecat@gmail.com>
Date: Wed Jun 17 16:08:59 2020 -0500
feat(content): Splash 2020
2020-06-18 13:16:07 -05:00
Sabe Jones
0116c56abb
chore(news): Bailey
2020-06-16 13:35:32 -05:00
Sabe Jones
873ac53e27
Squashed commit of the following:
...
commit f461c07ca7997362512a366eebc7d3a8fba854ee
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Jun 11 16:37:14 2020 -0500
fix(sprites): wolf alignment
commit 6ceb4ba6d1ea62892e9b335307043d78971328d0
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Jun 11 14:53:07 2020 -0500
chore(sprites): compile
commit 8b517309f531c7f151c5c18a5ca9847ab7aa5dbb
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Jun 11 14:52:49 2020 -0500
feat(content): Fluorite Magic Hatching Potion and quest
2020-06-11 16:38:05 -05:00
Sabe Jones
c4688b77fd
Merge branch 'sabrecat/armoire-bgs-202006' into release
2020-06-09 14:17:15 -05:00
Sabe Jones
604b866113
Merge branch 'develop' into release
2020-06-08 14:44:28 -05:00
Alys
c317d1d040
moved two words from slurs to banned - TRIGGER / CONTENT WARNING: slurs, swearwords, assault, etc
...
Refer to the new comment in bannedWords.js for the reason.
2020-06-06 16:26:58 +10:00
Sabe Jones
8a1c1af461
Merge branch 'release' into develop
2020-06-01 16:41:00 -05:00
Sabe Jones
6253359d31
chore(news): Bailey
2020-06-01 16:40:33 -05:00
Bart Enkelaar
1c00d7de5b
Fix empty link bug and proper error logging in highlightMentions.js ( #12228 )
...
* fix(chat) - Don't insert user link in url-less link and properly log source-mapping failures
* fix(chat) - Add link to markdown spec and list of known issues
* fix(chat) - Log regular expression as String
2020-05-31 18:09:43 +02:00
Sabe Jones
05e229ccb0
feat(content): subscriber items June 2020
2020-05-28 16:51:12 -05:00
Sabe Jones
95a3c932c5
Merge branch 'develop' into release
2020-05-21 14:59:58 -05:00
Sabe Jones
51d1f6b86a
Merge branch 'sabrecat/feedback-links' into release
2020-05-21 14:59:43 -05:00
Sabe Jones
b0f29211a8
chore(news): bailey
2020-05-21 14:59:28 -05:00
Bart Enkelaar
26f5bf554e
fix(chat) - graceful for failure and fix link regex ( #12225 )
...
* fix(chat) - graceful for failure and fix link regex
* fix(chat) - Adjust unit test to test for the actual functional failure
2020-05-21 18:00:58 +02:00
Sabe Jones
c421da34cc
chore(feedback): replace Trello links
2020-05-19 15:15:21 -05:00
Sabe Jones
36461cbbdf
Merge branch 'release' into develop
2020-05-19 14:01:49 -05:00
Sabe Jones
80a2e31c8e
feat(content): new achievement and bundle
2020-05-19 14:00:25 -05:00
Bart Enkelaar
85d290a1fa
fix(chat) - Issue 12217 - Allow url-escapable characters in links. ( #12218 )
2020-05-19 17:28:55 +02:00
Sabe Jones
4c7306491b
Merge branch 'develop' into release
2020-05-14 14:03:09 -05:00
Sabe Jones
1164f5e5f5
chore(news): Bailey at Rest
2020-05-14 14:03:05 -05:00
Matteo Pagliazzi
092d6726b8
fix(subscriptions): use correct termination date field and add extra check when it is missing
2020-05-14 12:56:12 +02:00
Sabe Jones
714a18ce5c
Merge branch 'release' into develop
2020-05-12 15:58:13 -05:00
Sabe Jones
8747a2d1b6
feat(content): reenable some May potions
2020-05-12 15:57:40 -05:00
Bart Enkelaar
ef99943646
Don't break up links with user profile link injections ( #12100 )
...
* Issue 10924 - Don't break up links with mention links
* Issue 10924 - Recognise links between brackets.
* Issue 10924 - Rely on markdown parser for link determination
* Issue 10924 - Only increment index once in findTextBlocks
2020-05-09 19:37:08 +02:00
Sabe Jones
be622e8b10
Merge branch 'release' into develop
2020-05-05 15:03:39 -05:00
Sabe Jones
8fe563aa37
feat(content): armoire, backgrounds
2020-05-05 15:02:36 -05:00
Matteo Pagliazzi
e5f1f3b279
Improve i18n caching ( #12030 )
...
* fix indentation
* wip: cache i18n responses
* cache i18n browser script to disk
* typos
* misc fixes
2020-05-05 20:31:33 +02:00
Sabe Jones
446122d7b8
To-Do cron task decay fixes ( #12072 )
...
* fix(tasks): improve some cron behaviors
Fixes #6488
Fixes #8590
* add test
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
2020-05-05 18:52:44 +02:00
Bart Enkelaar
93335352ec
Dont throw away extra paypal months ( #12149 )
...
* Issue 10605 - Don't pointlessly format dates
* fix(10605): Be defensive about setting plan termination dates
2020-05-05 17:16:35 +02:00
Bart Enkelaar
6e24cf0fe1
Vue component unit test isolation ( #12154 )
...
* Issue 10786 - Add unit test for Home component
* Issue 10786 - Improve test setup and test invite parameter variations
* Issue 10786 - Improve Vue.js test isolation by adding async keyword to dispatch function
* Issue 10786 - Missing action does not need to be awaited
* Use localVue for groupsUtilities test and revert partial zone fix
2020-05-05 16:20:08 +02:00
Sabe Jones
adff828c91
Merge branch 'release' into develop
2020-05-04 14:52:06 -05:00
Sabe Jones
671c90a593
chore(news): Bailey
2020-05-04 14:50:36 -05:00
negue
1c94c1a968
fix: return full inbox on user-v3-api ( #12146 )
...
* fix inbox on user-v3-api + test
* add @benkelaar suggestions
2020-05-02 21:48:16 +02:00
negue
26767f598b
API: Adding secret.text to the user-schema ( #12121 )
2020-05-02 19:59:05 +02:00
Sabe Jones
4e93874483
chore(news): Last Chance Bailey
2020-04-30 13:13:18 -05:00
Matteo Pagliazzi
61ca931e66
fix(string utils): do not escape possible regular expressions
2020-04-28 16:47:52 +02:00
Matteo Pagliazzi
2888f843e3
fix(push notifications): remove tokens after a MismatchSenderId error
2020-04-28 16:16:10 +02:00
Matteo Pagliazzi
b947c714f0
fix(regexp): escape inputs
2020-04-28 16:00:17 +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
c879560445
add ability to log amplitude events ( #12120 )
2020-04-24 19:02:27 +02:00
Matteo Pagliazzi
188023b197
fix #12118 : pass mandatory second parameter to markdown-it parse method
2020-04-24 12:06:05 +02:00
Sabe Jones
ce07d06c15
chore(news): Bailey
2020-04-23 13:59:48 -05: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
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
Matteo Pagliazzi
8ca5ee99b0
Merge branch 'release' into develop
2020-04-18 16:09:40 +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
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
Matteo Pagliazzi
f71062e86c
Merge branch 'release' into develop
2020-04-17 20:50:11 +02:00
Matteo Pagliazzi
1800fabaaa
Merge pull request #129 from HabitRPG/cache-fixes-3
...
API Cache fixes
2020-04-17 15:08:15 +02:00
Matteo Pagliazzi
193e7062c3
Merge branch 'release' into develop
2020-04-17 15:00:58 +02:00
Matteo Pagliazzi
cda5c6fbb0
res.header -> res.set
2020-04-17 14:57:53 +02:00
Matteo Pagliazzi
495d01f386
fix(static files): cache more static files ( #12102 )
2020-04-17 14:52:28 +02:00
Matteo Pagliazzi
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
Matteo Pagliazzi
f757e645b7
disable caching for the /status api route
2020-04-17 14:22:32 +02:00
Matteo Pagliazzi
bf492933cc
fix(cache): explicitly disable caching for most api routes
2020-04-17 14:22:20 +02:00
Matteo Pagliazzi
86d2fed76e
fix(apple auth): minor fixes, make sure apple auth users are considered when sending emails
2020-04-16 23:23:08 +02:00
Sabe Jones
c8189360d6
Merge branch 'develop' into release
2020-04-16 15:17:56 -05:00
Sabe Jones
88183149c5
chore(news): Bailey
2020-04-16 15:17:14 -05:00
Matteo Pagliazzi
a8f397c674
fix(join group): do not throw if inviter has does not exist
2020-04-15 21:43:24 +02:00
Matteo Pagliazzi
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
Denys Dorokhov
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
Sabe Jones
1e1c058d82
Merge branch 'release' into develop
2020-04-14 14:50:46 -05:00
Sabe Jones
168a3a6e89
Merge branch 'sabrecat/potion-time' into release
2020-04-14 14:49:18 -05:00
Sabe Jones
67bd2d9130
feat(content): enable spring avatar customizations
2020-04-14 14:49:11 -05:00
Matteo Pagliazzi
259b15877b
chore(deps): remove unused aws-sdk file and dependency
2020-04-14 17:03:42 +02:00
Alys
57a9fb5241
add comment to contributor.critical flag in user model
2020-04-13 15:15:26 +10:00
Matteo Pagliazzi
2a8fc7aea2
Push Notifications Improvements ( #12019 )
...
* start fixing push notitifications
* push notifications: refactor error handling
* remove comment and improve logging
* improve emails errors
* wip: start improving webhooks tests
* add max length to push notifications and tests
* fix typos
2020-04-10 16:41:44 +02:00
Sabe Jones
0f2d2ddad6
Merge branch 'develop' into release
2020-04-09 06:28:06 -05:00
Matteo Pagliazzi
0ea1ce9758
fix(logs): do not log mongoose object with id and no _id to avoid crashes, see https://github.com/davidmarkclements/fast-safe-stringify/issues/43
2020-04-08 23:31:17 +02:00
Phillip Thelen
9d16ab7dba
Sign in with Apple ( #11793 )
...
* add date check
* achievements modal polishing
* refresh private-messages page when you are already on it
* add countbadge knob to change the example
* fix lint
* typos
* typos
* typos
* add toggle for achievements categories
* typo
* fix test
* fix edit avatar modal cannot be closed
* WIP(settings): subscriber page improvements
* WIP(subscriptions): more design build-out
* fix(css): disabled button styles
* fix(css): better Amazon targeting
* fix hide tooltip + align header correctly
* disable perfect scroll
* load messages on refresh event
* fix header label + conversation actions not breaking layout on hover
* WIP(g1g1): notif
* WIP(g1g1): notif cont'd
* fix(test): snowball change
* fix(event): feature NYE card
* chore(sprites): compile
* fix(bgs): include TT required field
* add gifting banner to the max height calculation
* chore(event): enable winter customizations
* WIP(gifting): partial modal implementation
* feat(gifting): select giftee modal
* fix(gifting): notification order, modal dismiss
* Begin implementing sign in with apple
# Conflicts:
# package-lock.json
# website/common/script/constants.js
# website/server/libs/auth/social.js
# website/server/models/user/schema.js
* Add apple sign in button to website
* fix lint errors
* fix config json
* fix(modals): correct some repops
* fix(gifting): style updates
* fix(buy): modal style changes
* fix(modals): also clean out "prev"
* Attempt workaround for sign in with apple on android
* temporarily log everything as error
* refactor(modals): hide in dismiss event
* fix temporary test failure
* changes to sign in with apple
* fix: first batch of layout issues for private messages + auto sizing textarea
* fix(modals): new dismiss logic
* fix(modals): new dismiss no go??
* Only use email scope
* print debugging
* .
* ..
* ...
* username second line - open profile on face-avatar/conversation name - fix textarea height
* temporarily disable apple auth and just return data for debugging
* Hopefully this works
* .....
* WIP(subscription): unsubscribed state
* .
* ..
* MAYBE THIS ACTUALLY WORKS???
* Implement apple sign in
* fix some urls
* fix urls
* fix redirect and auth
* attempt to also request name
* fix lint error
* WIP(subscription): partial subscribed
* chore(sprites): compile
* Change approach so that it actually works
* fix config error
* fix lint errors
* Fix
* fix lint error
* lint error
* WIP(subscription): finish subscribed
* refresh on sync
* new "you dont have any messages" style + changed min textarea height
* new conversationItem style / layout
* reset message unread on reload
* chore(npm): update package-locks
* fix styles / textarea height
* feat(subscription): revised sub page RC
* list optOut / chatRevoked informations for each conversation + show why its disabled
* Improve apple redirect view
* Fix apple icon on group task registration page
* WIP(adventure): prereqs
* Block / Unblock - correct disabled states - $gray-200 instead of 300/400
* canReceive not checking chatRevoked
* fix: faceAvatar / userLink open the selected conversation user
* check if the target user is blocking the logged-in user
* fix(subs): style tweaks
* fix(profiles): short circuit contributor
Attempted fix for #11830
* chore(sprites): compile
* fix(content): missing potion data
* fix(content): missing string
* WIP(drops): new modal
* fix(subs): moar style tweaks
* check if blocks is undefined
* max-height instead of height
* fix "no messages" state + canReceive on a new conversation
* WIP(adventure): analytics fixes etc
* Improve apple signin handling
* fixed conversations width (280px on max 768 width page)
* feat(adventure): random egg+potion on 2nd task
* fix(lint): noworkies
* fix(modal): correctly construct classes
* fix(tests): expectations and escape
* Fix typo
* use base url from env variables
* fix lint
* call autosize after message is sent
* fix urls
* always verify token
* throw error when social auth could not retrieve id
* Store emails correctly for apple auth
* Retrieve name when authenticating through apple
* Fix lint errors
* fix all lint errors
* fix(content): missing strings
* Revert "always verify token"
This reverts commit 8ac40c76bfa880f68fa3ce350a86ce2151b9cf95.
# Conflicts:
# website/server/libs/auth/social.js
* Correctly load name
* remove extra changes
* remove extra logger call
* reset package and package-lock
* add back missing packages
* use name from apple
* add support for multiple apple public keys
* add some unit and integration tests
* add apple auth integration test
* tweak social signup buttons
* pixel pushing
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: negue <eugen.bolz@gmail.com>
Co-authored-by: Phillip Thelen <phillip@habitica.com>
2020-04-08 18:44:30 +02:00
Sabe Jones
5ccd2ae262
chore(event): seeds and sprites
2020-04-07 14:08:09 -05:00
Sabe Jones
a1a1fd939d
Merge branch 'sabrecat/dessert-potions' into release
2020-04-07 13:59:36 -05:00
Sabe Jones
9fea01b1f4
Merge branch 'sabrecat/armoire-202004' into release
2020-04-06 10:41:40 -05:00
Matteo Pagliazzi
8ad644ec3a
remove comment and improve logging
2020-04-06 10:57:36 +02:00
Matteo Pagliazzi
6f2bf5659d
improve emails errors
2020-04-06 10:56:39 +02:00
hamboomger
b7448e2cfe
fix(server-api): cancelSubscription() is no longer called twice when user leaves group
2020-04-05 15:06:16 +03:00
hamboomger
0bc836b490
refactor(payments): unit tests created for calculation of subscription termination date
2020-04-05 15:06:16 +03:00
hamboomger
fdf7e3a665
fix(db-schema): typo fixed in group.hasCancelled() schema metod name
2020-04-05 15:06:16 +03:00
hamboomger
00d12e83bd
refactor(db-schema): group.isSubscribed() method name changed to group.hasActiveGroupPlan()
2020-04-05 15:06:16 +03:00
Sabe Jones
167f4f07b8
feat(content): Confection Pets
2020-04-03 19:25:43 -05:00
Sabe Jones
25e5183370
feat(content): Armoire/BGs 2020-04
2020-04-03 15:41:35 -05:00
Sabe Jones
a2c91aae70
chore(news): Challenge and Blog Bailey
2020-04-02 16:09:36 -05:00
Sabe Jones
3ac69d5e75
Merge branch 'develop' into release
2020-04-02 15:09:54 -05:00
Matteo Pagliazzi
28bc843779
Misc Webhooks Fixes ( #12038 )
...
* fix(webhooks): don t parse response as json
* upgrade got to version 10
* remove old header
* fix tests
* fix email auth
* add migration
* update email error
* split migration in two
2020-04-02 21:48:47 +02:00
Matteo Pagliazzi
e92ff9737a
Automatically Logout Banned Users ( #12037 )
...
* wip
* logout banned users, fix and refactor language library and middleware
* req.locals -> res.locals
* fix tests
* redirect to login page
2020-04-02 21:46:01 +02:00
Sabe Jones
c3343c9412
fix(news): Challenge link
2020-04-01 10:23:07 -05:00
Sabe Jones
e39eafd3f0
feat(event): April Foolin
2020-04-01 06:31:39 -05:00
Sabe Jones
6d26fbc5f2
feat(content): April subscriber items
2020-03-30 16:12:03 -05:00
Sabe Jones
bb9912de89
fix(analytics): problems
2020-03-30 15:38:41 -05:00
Sabe Jones
7bdc974704
Merge branch 'develop' into release
2020-03-26 15:15:38 -05:00
Sabe Jones
fe8780d49c
chore(news): Bailey
2020-03-26 15:15:25 -05:00
Matteo Pagliazzi
2fc4d0f00c
fix(logger): only two arguments to logger when logging an unhandled promise rejection
2020-03-26 17:10:19 +01:00
Matteo Pagliazzi
4300c7b1bf
Merge branch 'develop' of github.com:HabitRPG/habitica into develop
2020-03-24 20:31:27 +01:00
Matteo Pagliazzi
2cd0ed5973
fix(logger): improve logging and make sure no data is lost
2020-03-24 20:29:31 +01:00
Sabe Jones
6e8bdf4cdf
Merge branch 'release' into develop
2020-03-24 13:14:15 -05:00
Sabe Jones
3e96e54ad8
feat(event): eggy eggy
2020-03-24 13:13:50 -05:00
Denys Dorokhov
25e72ad907
Reward with negative cost can no longer be created, fixes #11855 ( #11870 )
...
* Minor refactoring in scoreTask.js
* Reward value validation added (should be >= 0)
2020-03-24 12:10:10 +01:00
Matteo Pagliazzi
f8aa756d52
Disable Failing Webhooks ( #11966 )
...
* todo comment
* add failures field to webhooks and sanitize
* implement logic
* use update instead of save
* specify timeout and maximum number of retries
* add tests
2020-03-20 23:26:21 +01:00
Matteo Pagliazzi
ae7df804cb
fix(promise): make sure every promise is handled
2020-03-20 20:07:13 +01:00
Matteo Pagliazzi
dd91bada8f
Merge branch 'release' into develop
2020-03-18 19:30:11 +01:00
Matteo Pagliazzi
d724933640
update mongoose options
2020-03-18 19:20:09 +01:00
Sabe Jones
55feebdf9e
Merge branch 'release' into develop
2020-03-17 15:36:35 -05:00
Sabe Jones
353b4aed05
feat(content): Magic Hatching Potions
2020-03-17 15:35:38 -05:00
Sabe Jones
914eee015e
Merge branch 'release' into develop
2020-03-17 09:12:29 -05:00
Sabe Jones
92c3a640ee
feat(content): Bug Bonanza achievement
2020-03-17 09:11:41 -05:00
tsukimi2
519af8f1b6
Fix for search guilds result being inconsistent between "My Guilds" and "Discover Guilds" ( #11903 )
...
* Fix bug to allow guild summary and description to match against search term in MyGuilds component
* Add unit test to groupUtilities to test filterGroup function
* Changes made after running npm:run:lint
* Fix bug when filter guild function does not match against guild size correctly when the guild has member count = 100 or 1000
According to habitica wiki Guilds Guide, gold-tier guilds are guilds with 1000 or more members. However, under the current code of filter guild function, it matches guilds as gold-tier as strictly more than 1000 members, excluding 1000 members. Similar silver-tier guilds should have 100 to 999 members, but the current code it matches guilds as silver-tier for members between 101 and 999 members.
* Added unit tests to test the newly added code in the groupsUtilities mixin for the current issue
* Add unit testing to test search guild name, summary, and description in myGuilds component
* Add suggestions from lint
* Added searching by guild summary and white space handling in search terms.
For discover guilds component, added the following:
1) handling of searching by guild summary
2) preventing white space in search terms to display all guilds
3) added test cases for testing the search functionality in discove guilds to ensure consistent behaviour between the searching in MyGuilds and public guilds.
* Remove console statements from test file
* Implement suggestions from lint.
Co-authored-by: osiris <eynsan@yahoo.co.uk>
2020-03-16 20:03:48 +01:00
Sabe Jones
39bb60638f
feat(content): Pi Day 2020
2020-03-13 10:59:52 -05:00
Sabe Jones
4ee14e7c2a
Merge branch 'release' into develop
2020-03-10 14:26:47 -05:00
Sabe Jones
86951916e8
feat(content): enable bug hugging
2020-03-10 14:25:30 -05:00
Matteo Pagliazzi
276e882092
fix(challenges): handle case where challenge has no categories or result is empty
2020-03-09 21:17:27 +01:00
Alec Brickner
88bfed7efe
Ensure official challenges are listed first ( fixes #11018 ) ( #11030 )
...
* Ensure official challenges are listed first
* Fix lint errors
* Move query creation into separate function
* switching branches
* Fixes and tests
* Formatting fixes
* Linting
* fix tests
2020-03-09 20:08:28 +01:00
Matteo Pagliazzi
b9bfb3f722
fix(logs): call split on strings only
2020-03-09 16:18:57 +01:00
Matteo Pagliazzi
2062e78959
fix(logs): FCM, only log defined errors
2020-03-09 15:16:10 +01:00
Matteo Pagliazzi
018c5edfdd
fix(logs): FCM, only log defined errors
2020-03-09 15:13:15 +01:00
Sabe Jones
bd8e67a2ea
Adventure Guide Prep ( #11883 )
...
* WIP(adventure): prereqs
* WIP(drops): new modal
* WIP(adventure): analytics fixes etc
* feat(adventure): random egg+potion on 2nd task
* fix(lint): noworkies
* fix(modal): correctly construct classes
* fix(tests): expectations and escape
* fix(first-drops): address comments
* fix(first-drops): don't give random drops until first drops
* fix(drops): remove more Level 3 references
* refactor(drops): no need for cloning
* refactor(drops): unnecessary export
* fix(first-drops): force sync
* fix(first-drops): move to server
* fix(first-drops): escape in case we get here with >0 items
* fix(lint): line length
* fix(pet-food): remove unused string
2020-03-07 13:03:13 -06:00
negue
fe6c21800c
Fixing layout issues for the private messages page ( #11766 )
...
* fix: first batch of layout issues for private messages + auto sizing textarea
* username second line - open profile on face-avatar/conversation name - fix textarea height
* refresh on sync
* new "you dont have any messages" style + changed min textarea height
* new conversationItem style / layout
* reset message unread on reload
* fix styles / textarea height
* list optOut / chatRevoked informations for each conversation + show why its disabled
* Block / Unblock - correct disabled states - $gray-200 instead of 300/400
* canReceive not checking chatRevoked
* fix: faceAvatar / userLink open the selected conversation user
* check if the target user is blocking the logged-in user
* check if blocks is undefined
* max-height instead of height
* fix "no messages" state + canReceive on a new conversation
* fixed conversations width (280px on max 768 width page)
* call autosize after message is sent
* only color the placeholder
* only load the current user avatar/settings/flags
* show only the current avatar on private messages
2020-03-04 17:50:08 +01:00
Matteo Pagliazzi
2ff9dfe965
Fix username links resulting in truncated chat messages ( #11945 )
...
* introduce MAX_MESSAGE_LENGTH constant
* add test
* fix path
* fix and tests
* fix typo in tests
2020-03-04 11:49:14 +01:00
Sabe Jones
3fe307f6ea
Merge branch 'release' into develop
2020-03-03 16:15:52 -06:00
Sabe Jones
08856ecc9f
chore(news): nother Bailey
2020-03-03 16:12:30 -06:00
Sabe Jones
bccd8e0000
Merge branch 'release' into develop
2020-03-02 16:21:24 -06:00
Sabe Jones
80b302c997
chore(news): Bailey
2020-03-02 16:20:48 -06:00
Matteo Pagliazzi
6a9025200c
fix(logs): disable colors in production logs
2020-03-02 11:33:11 +01:00
Matteo Pagliazzi
4e3481445c
fix(logs): log text message in production
2020-03-02 11:20:56 +01:00
Matteo Pagliazzi
8300464cfc
Merge pull request #11887 from HabitRPG/stackdriver-winston
...
Logs improvements
2020-03-02 11:05:15 +01:00
Matteo Pagliazzi
c5208f0ef6
fix tags
2020-03-01 22:21:53 +01:00
Matteo Pagliazzi
3f5ee32684
fix invalid push devices
2020-03-01 21:49:52 +01:00
Matteo Pagliazzi
6deee0ffc8
notifications tests
2020-03-01 21:29:57 +01:00
Matteo Pagliazzi
a11e4d0512
fix lint
2020-03-01 20:53:33 +01:00
Matteo Pagliazzi
118e3580d6
refactor notifications cleanup
2020-03-01 20:06:24 +01:00
Matteo Pagliazzi
343f276705
re-enable notifications validation
2020-03-01 13:30:22 +01:00
Matteo Pagliazzi
ae3f014bb2
add ability to disable console logs in prod while keeping loggly active
2020-02-29 17:48:09 +01:00
Matteo Pagliazzi
15e6cef7c4
fix tests
2020-02-29 17:40:46 +01:00
Matteo Pagliazzi
a5c4871183
Merge branch 'develop' into stackdriver-winston
2020-02-28 19:32:22 +01:00
Sabe Jones
07d6969764
Merge branch 'develop' into release
2020-02-27 15:00:46 -06:00
Sabe Jones
5807db9053
chore(news): Last Chance Bailey
2020-02-27 15:00:33 -06:00
Matteo Pagliazzi
3650426edc
fix(task): hotfix for when task.attribute is sent as null
2020-02-27 14:25:26 +01:00
Matteo Pagliazzi
a046930097
Merge branch 'develop' into stackdriver-winston
2020-02-26 18:40:25 +01:00
Alys
7579bec587
allow another guild to use banned words in appropriate contexts
...
This commit also puts the list of guilds into alphabetical order.
2020-02-26 07:45:31 +10:00
Alys
c1e7fed4d4
move a word from slurs to swears as discussed with beffymaroo and mods
2020-02-26 07:44:36 +10:00
Matteo Pagliazzi
0280513a00
improvements to apidocs comments ( #11832 )
...
* make corrections and improvements to apidocs (no code changes)
* make further minor tweaks to apidocs that were previously changed
* make one extra small change for consistency
* fix lines that are too long
Each line was fixed by one of these:
- changing the wording
- breaking into separate lines
- adding eslint-disable-line max-len (necessary for `@api ` lines because
a line break there causes the first part of the text to not be displayed
on the apidocs website)
* apply eslint-disable max-len around block comments that need to have a long line
The `@api ` lines can't have a line break in them because it would
cause the first part of the text to not be displayed on the apidocs
website.
Using `// eslint-disable-line max-len` at the end of an `@api `
line doesn't work, possibly because it's nesting a comment inside
a multi-line comment.
The only way I've found to ignore the `max-len` rule is to put
disable and enable comments around the whole comment block.
2020-02-24 21:22:29 +01:00
Matteo Pagliazzi
6a5e1dda0e
fixes
2020-02-20 20:58:42 +01:00
Matteo Pagliazzi
70326e5b5b
upgrade loggly transport
2020-02-20 20:54:32 +01:00
Matteo Pagliazzi
c91c152b53
fix error messages in console
2020-02-20 20:51:16 +01:00
Matteo Pagliazzi
362313fe0a
fix info messages
2020-02-20 20:05:58 +01:00
Matteo Pagliazzi
ed5dfd0228
start upgrading winston
2020-02-20 19:37:31 +01:00
Sabe Jones
5e31278d2a
chore(news): Bailey
2020-02-20 11:57:56 -06:00
Alys
0891908cba
Merge remote-tracking branch 'upstream/develop' into apidocs-comment-fixes
2020-02-20 09:47:44 +10:00
Ian McKenzie
6a483edfe1
Resolves #11861 — Makes "quest already started" error descriptive ( #11862 )
...
* Resolves #11861
* Fix unit tests for translation changes
* Remove non-en quest.json locales
2020-02-19 16:07:17 +01:00
Sabe Jones
f413073d35
Merge branch 'release' into develop
2020-02-18 14:15:21 -06:00
Sabe Jones
69179c61b1
feat(content): Cotton Candy Pink Prizes
2020-02-17 11:37:37 -06:00
Matteo Pagliazzi
a60022e54d
Merge pull request #11859 from citrusella/apidocfixes
...
Fixing some typos, etc. in the API doc
2020-02-17 14:50:24 +01:00
citrusella
d3d7ad2693
Add missing quote in values allowed on gem item
2020-02-14 21:37:21 -05:00
Sabe Jones
9a6f8021e3
Subscription Page Overhaul ( #11823 )
...
* WIP(settings): subscriber page improvements
* WIP(subscriptions): more design build-out
* fix(css): disabled button styles
* fix(css): better Amazon targeting
* WIP(g1g1): notif
* WIP(g1g1): notif cont'd
* WIP(gifting): partial modal implementation
* feat(gifting): select giftee modal
* fix(gifting): notification order, modal dismiss
* fix(modals): correct some repops
* fix(gifting): style updates
* fix(modals): also clean out "prev"
* refactor(modals): hide in dismiss event
* fix(modals): new dismiss logic
* fix(modals): new dismiss no go??
* WIP(subscription): unsubscribed state
* WIP(subscription): partial subscribed
* WIP(subscription): finish subscribed
* feat(subscription): revised sub page RC
* fix(subs): style tweaks
* fix(subs): moar style tweaks
2020-02-13 13:12:45 -06:00
Sabe Jones
c11a384a35
fix(news): link
2020-02-13 12:42:58 -06:00
citrusella
80de90cc5f
Attempt to fix typos in the API doc
2020-02-12 15:40:44 -05:00
Sabe Jones
6324ef72df
feat(content): Magic Hatching Quest
2020-02-11 16:09:51 -06:00
Sabe Jones
107444043e
Merge branch 'release' into develop
2020-02-11 14:33:25 -06:00
Phillip Thelen
0648f5d412
Prevent server from cancelling still active subs ( #11795 )
...
* Prevent server from cancelling still active subs
* Allow subs to be cancelled before end date
* fix test
* fix test
2020-02-11 12:58:11 -06:00
Alys
15976e906a
apply eslint-disable max-len around block comments that need to have a long line
...
The `@api ` lines can't have a line break in them because it would
cause the first part of the text to not be displayed on the apidocs
website.
Using `// eslint-disable-line max-len` at the end of an `@api `
line doesn't work, possibly because it's nesting a comment inside
a multi-line comment.
The only way I've found to ignore the `max-len` rule is to put
disable and enable comments around the whole comment block.
2020-02-08 16:06:00 +10:00
Alys
ac52da5be2
fix lines that are too long
...
Each line was fixed by one of these:
- changing the wording
- breaking into separate lines
- adding eslint-disable-line max-len (necessary for `@api ` lines because
a line break there causes the first part of the text to not be displayed
on the apidocs website)
2020-02-08 14:55:21 +10:00
Alys
1b39338eec
make one extra small change for consistency
2020-02-08 14:30:48 +10:00
Alys
6fe87a8140
make further minor tweaks to apidocs that were previously changed
2020-02-08 14:26:01 +10:00
Alys
c5d0ff63a5
make corrections and improvements to apidocs (no code changes)
2020-02-08 14:12:20 +10:00
Sabe Jones
6f7243c049
feat(event): Valentine's 2020
2020-02-07 14:16:25 -06:00
Sabe Jones
99a9bfe62e
chore(news): Bailey
2020-02-06 15:13:55 -06:00
Sabe Jones
b2cfeaf9bd
feat(content): Armoire and Backgrounds 2020-02
2020-02-04 15:42:12 -06:00
Sabe Jones
e800cd9a3f
chore(event): End Wonderland
2020-02-01 07:20:55 -06:00
Sabe Jones
728eaecfc8
Merge branch 'develop' into release
2020-01-31 06:47:26 -06:00
Sabe Jones
e31de5c8f0
feat(content): Feb 2020 subscriber set
2020-01-31 06:46:56 -06:00
Alys
82a5bc236f
clarify all "Invalid uuid" messages by making each unique
2020-01-29 15:49:55 +10:00
Sabe Jones
bc1eb62a35
feat(event): Birthday 2020
2020-01-28 15:39:05 -06:00
Sabe Jones
cbac69ab11
chore(news): Bailey
2020-01-23 15:47:53 -06:00
Sabe Jones
1f16891b15
Merge branch 'release' into develop
2020-01-21 15:47:39 -06:00
Sabe Jones
8bdd56587e
chore(timetrav): Bailey
2020-01-21 15:41:16 -06:00
Matteo Pagliazzi
ca69085e8c
Merge pull request #11549 from Nikosmonaut/bugfix-11522_group_plan_tags
...
Fix can not remove group tag
2020-01-19 12:29:04 +01:00
Sabe Jones
04960f8ff8
chore(news): Bailey
2020-01-16 16:11:40 -06:00
Sabe Jones
fcbc87afc2
Merge branch 'release' into develop
2020-01-14 14:59:58 -06:00
Sabe Jones
e15fdbbe05
fix(nye): no more hats
2020-01-14 14:59:28 -06:00
Matteo Pagliazzi
9510b2345c
Merge pull request #11636 from tsukimi2/bugfix-send-pmsg
...
Fix incorrect error when sending private messages to a player you have blocked (fixes #11612 )
2020-01-14 13:24:05 +01:00
Matteo Pagliazzi
fa9f962e45
Merge pull request #11707 from cvuorinen/11682-quest-invitation-webhook
...
Quest invitation webhook
2020-01-14 13:06:31 +01:00
Sabe Jones
8b569e2136
PMs rebuild ( #11360 )
...
* feat(messages): big PMs refactor
* add private messages route
* move to page
* WIP - header + begin with the sidebar
* extract userLabel + style sidebar + extract converstation item
* correct conversation item style
* toggle switch style
* add contributor / backer to conversation user-label
* fix shadows
* fix the conversations list (ignoring own sent)
* selected conversation label
* faceAvatar component
* fix message / avatar height
* fix message list / empty messages height
* new message padding/styles/functionality - finished sidebar conversation styling -
* fix loading messages + perfect-scrollbar
* fix load more line
* fix loading label
* open new conversation from outside
* if the user doesn't have avatar-data inside the conversation and does not exist anymore, just load/set the user name
* search bar new icon / style
* block using from conversation context-menu
* fix lint
* fix merge / lint
* fix merge
* first separate page
* fix tooltips + full width private message + card max width + more responsive
* separate conversations methods, to prevent circular deps
* update eslint config
* fix open new private message
* remove unneeded close icon + fix toggle-switch layout
* same content height on empty conversations - remove border / box-shadow
* canLoadMore = false
* remove inbox conditions on chat components
* hide footer / fix empty sidebar
* floating shadow
* remove tooltip on selected conversation user + pm always full-size
* show avatar on empty conversation
* disable face-avatar
* fix faceAvatar + story
* fix loading conversation messages while switching the conversation
* refresh private-messages page when you are already on it
* add countbadge knob to change the example
* fix lint
* fix hide tooltip + align header correctly
* disable perfect scroll
* load messages on refresh event
* fix header label + conversation actions not breaking layout on hover
* add gifting banner to the max height calculation
* correct chunk name
Co-authored-by: negue <negue@users.noreply.github.com>
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
2020-01-12 19:34:40 +01:00
Carl Vuorinen
a487c708be
Add documentation about questActivity and userActivity webhooks
2020-01-11 00:36:45 +02:00
Carl Vuorinen
9258f8ad26
Send questInvited webhooks
2020-01-11 00:32:10 +02:00
Sabe Jones
f47ccfdb6d
chore(event): enable winter customizations
2020-01-10 15:32:36 -06:00
Sabe Jones
7faf443197
chore(event): enable winter customizations
2020-01-10 15:32:08 -06:00
Carl Vuorinen
e6edaca11d
Add questInvited option to webhook model
2020-01-10 20:27:50 +02:00
Sabe Jones
fe9af263dd
Merge branch 'release' into develop
2020-01-07 11:48:09 -06:00
Sabe Jones
25809e5c00
feat(content): Armoire, BGs
2020-01-07 11:43:14 -06:00
Sabe Jones
f6ecc1cb84
chore(promo): end g1g1
2020-01-07 10:13:32 -06:00
Sabe Jones
d7d5d7e85a
Merge branch 'release' into develop
2020-01-06 12:13:00 -06:00
Sabe Jones
4a0c16065f
chore(news): Bailey
2020-01-06 12:12:34 -06:00
Sabe Jones
44bb304119
Merge branch 'release' into develop
2020-01-01 14:45:55 -06:00
Sabe Jones
904dfd3d72
chore(news): Bailey
2020-01-01 14:45:18 -06:00
Sabe Jones
df72d240fd
Merge branch 'release' into develop
2019-12-31 06:52:22 -06:00
Sabe Jones
2693d49870
feat(content): NYE 2019-20 etc
2019-12-30 15:05:45 -06:00
Sabe Jones
3ba8b04962
Merge branch 'release' into develop
2019-12-26 14:21:06 -06:00
Sabe Jones
da9e07d71a
chore(news): bailey
2019-12-26 14:20:42 -06:00
Yo
04a9c97393
Fix Typos ( #11644 )
...
* Fix Typos
* Fix More Typos
2019-12-23 17:52:55 +01:00
Sabe Jones
be107f02d3
Merge branch 'develop' into release
2019-12-19 16:55:10 -06:00
Sabe Jones
c4b16f86db
feat(event): Wonderland 2019-20
2019-12-19 16:54:27 -06:00
Phillip Thelen
cc7d065445
Fix purchasing non-recurring subscriptions ( #11646 )
...
* Fix purchasing non-recurring subscriptions
This fixes a bug where non-recurring subscriptions were not correctly purchased on iOS.
* fix linter errors
* refactor(lint): line length
2019-12-19 11:13:39 -06:00
Matteo Pagliazzi
e4edab2b9d
Minimum password length + Static Pages fixes (was #11474 ) ( #11506 )
...
* Revert "Revert "Minimum password length + Static Pages fixes (#11474 )""
This reverts commit d1afbf4b92 .
* add min length for reset password
2019-12-18 19:02:15 +01:00
Sabe Jones
c36f01773f
Merge branch 'release' into develop
2019-12-17 14:50:29 -06:00
Sabe Jones
9fe28c6d51
fix(g1g1): send promo confirmation to self
2019-12-17 14:16:56 -06:00
Sabe Jones
34983f1221
feat(event): turn on G1G1 2019
2019-12-17 14:04:55 -06:00
Matteo Pagliazzi
8f5a0cfe79
Onboarding guide and initial achievements refactoring ( #11536 )
...
* add achievements to user
* add placeholder strings
* add to achievements to common script
* add onboarding achievements category
* add notifications
* more notifications
* award achievements
* wip notification panel
* add achievements icons and copy
* do not count onboarding tasks for the created task achievement
* add notes
* sprites, fixes and completion status and reward
* add onboarding panel
* add toggle
* fix toggle size
* fix tests
* fix typo
* add notification
* start adding modal
* fix remove button positionin, timeout, progress bar
* modal + fixes
* disable broken social links from level up modal
* change toggle icon color on hover
* add border bottom to onboarding guide panel
* add collapse animation
* expanded onboarding on first open
* onboarding: flip toggle colors
* onboarding: show progress bar all the time
* onboarding: fix panel closing on click
* onboarding modal: add close icon and fix padding
* wip: add migration for existing users
* fix titles in guide
* fix achievements copy
* do not award completed task achievement when direction is down
* start implementing new achievements
* start migrating client
* remove social links from achievements modals
* prevent skipping tutorial + fix achievement notification
* sync fixes
* start redesign achievement modal
* misc fixes to achievements, polish generic achievement modal and hatched pet modal
* add special badge for onboarding
* fix badge condition
* modals fixes
* hatched pet modal: add close icon
* fix badge typo
* fix justin button
* new scrolling behavior for dropdowns
* fix strings capitalization
* add common tests
* add api unit tests
* add date check
* achievements modal polishing
* typos
* add toggle for achievements categories
* typo
* fix test
* fix edit avatar modal cannot be closed
* finish migration and correct launch date
* fix migration
* migration fixes
* fix tests
2019-12-16 17:20:47 +01:00
osiris
104d888bfb
Fix incorrect error when sending private messages (PMs) to a player you have blocked #11612
...
Introduce a new error type blockedToSendToThisUser for the cases where you have blocked a player from sending private messages to you, if you try to message them or if you try to transfer gems to them, you will see the error "You can't send to this player because you have block this player."
2019-12-15 19:18:16 +08:00
nikosmonaut
1c719a8dbb
Unlink group tags when a user leaves it
2019-12-14 14:54:55 +01:00
Matteo Pagliazzi
315604073b
Merge branch 'fix-antidotes-from-revert' of https://github.com/Xaz16/habitica into Xaz16-fix-antidotes-from-revert
2019-12-13 14:24:50 +01:00
Jonathan Duncan
a45b04b1cf
APIDoc update for Tasks: fixes #10943 ( #11594 )
...
* Adding monthly and yearly to the frequency parameter.
* Adjusting frequency description to be more accurate.
* Adding missing fields: daysOfMonth and weeksOfMonth.
* Adjusting line length to meet lint standards.
2019-12-13 14:18:02 +01:00
Carl Vuorinen
cd90a281c2
Prevent duplicate challenge tasks ( #11502 )
...
* Implement atomic user challenges update
Prevents multiple concurrent requests from passing through
Fixes #11295
* Move user challenges update to separate method
* Rename challenge syncToUser to syncTasksToUser
Now that adding the challenge to user is separated, this methods main purpose is to sync the tasks
* Fix lint errors
2019-12-13 14:14:57 +01:00
Sabe Jones
7a52386daf
Merge branch 'release' into develop
2019-12-10 14:42:59 -06:00
Sabe Jones
40ba81a5d9
feat(content): FFFFFF Achievements
2019-12-10 14:41:39 -06:00
Xaz16
aa1fcb4956
Merge remote-tracking branch 'upstream/develop' into fix-antidotes-from-revert
2019-12-07 22:32:25 +03:00
negue
97a1d0f474
Storybook Example ( #11494 )
...
* 🎉 Working example of storybook and vue
* remove the older storybook version
* build storybook after client was built
* move storybook:build to npm-postintall
* remove automatically created eslint-disables + fix comment
* add back needed eslint :P + add @storybook/vue as devDep
* fix packagelock
* fix lint
* auto fixed lints + ignore dist/ node_modules/
* update package-lock.json
* add postbuild and readme
* add back customize config
* fix readme
* fix links in readme
* revert postbuild command
2019-12-05 22:35:23 +01:00
Sabe Jones
b6371971a2
Merge branch 'release' into develop
2019-12-03 20:27:27 +00:00
Sabe Jones
1224d6d0c9
feat(content): Armoire and BGs 2019-12
2019-12-03 20:25:50 +00:00
Sabe Jones
3466e62aa5
Merge branch 'release' into develop
2019-12-02 17:16:17 -06:00
Sabe Jones
11ebc6c397
chore(event): end Turkeys, Bailey
2019-12-02 17:15:41 -06:00
Phillip Thelen
b108b047cd
Improvements and fixes for push notifications ( #11507 )
...
* Strip markdown from push notifications
* Revert "Strip markdown from push notifications"
This reverts commit 4741e584c63031d0d4609e18a4e4f082d4c4e72e.
* correctly set type for mention push notifications
* Add unformattedText field to chat messages
* fiix lint errors
* Add check that markdown formatting is stripped from messages
* Add check for markdown formatting in messages.
2019-11-29 18:46:26 +01:00
Sabe Jones
45efbc1e4b
Merge branch 'develop' into release
2019-11-27 15:48:03 -06:00
Sabe Jones
e597906f35
feat(content): Harvest Feast 2019
2019-11-27 15:45:37 -06:00
Sabe Jones
6395070eb6
Award mystery items at cron ( #11519 )
...
* feat(subscriber): award mystery items at cron
* fix(mystery): backfill skipped months
* fix(mystery): adjust subscriber text
* fix(mystery): correct moment logic
and remove irrelevant tests
* fix(mystery): build set one month in advance
* fix(mystery): don't add empty set to Time Travelers
* refactor(mystery): readability
2019-11-27 12:10:56 -06:00
Sabe Jones
e8f9c4953e
Merge branch 'release' into develop
2019-11-26 15:59:03 -06:00
Sabe Jones
194f2d512a
feat(content): Amber Hatching Potion Quest
2019-11-26 15:58:18 -06:00
Matteo Pagliazzi
8983e7fea2
Merge pull request #11562 from HabitRPG/sabrecat/bulk-email-fix
...
Better promise handling for bulk emailing
2019-11-25 16:48:15 +01:00
Sabe Jones
2362976f14
Merge branch 'develop' into release
2019-11-21 16:17:43 -06:00
Sabe Jones
e0b8cfbaa7
feat(content): mystery items Nov 2019
2019-11-21 16:17:06 -06:00
Sabe Jones
66b2b47f87
Merge branch 'release' into develop
2019-11-19 15:26:23 -06:00
Sabe Jones
23bd51d486
chore(news): BlogBailey
2019-11-19 15:25:53 -06:00
Sabe Jones
b4efe11e6a
fix(async): remove catch, add return
2019-11-19 12:59:53 -06:00
Sabe Jones
46822ecbae
fix(email): better promise handling
2019-11-19 12:53:21 -06:00
Xaz16
960985dee5
Merge branch 'develop' into fix-antidotes-from-revert
2019-11-17 23:54:09 +03:00
Evelyn Stender
5f0672f3a6
Allow update webhook label with an empty string ( #11479 )
...
* Allow update webhook label with an empty string
* Adding comment to explain the label check
2019-11-16 17:52:27 +01:00
Sabe Jones
645f40f7e0
feat(content): Delightful Dinos Bundle
2019-11-14 15:08:45 -06:00
Sabe Jones
dc303fb1de
feat(content): enable some Magic Hatching Potions
2019-11-12 15:31:17 -06:00
Sabe Jones
a32622c81f
fix(invites): correct link constant
2019-11-05 10:47:08 -06:00
Sabe Jones
b441cfa9f3
Merge branch 'release' into develop
2019-11-05 10:30:30 -06:00
Sabe Jones
3e2a49103e
feat(content): Armoire and BGs 2019-11
...
and disable October Magic Potions
2019-11-05 10:29:39 -06:00
Matteo Pagliazzi
9988b1e82d
Revert "fix(challenge export): do not fetch users and tasks concurrently"
...
This reverts commit 4d88787ba0 .
2019-11-02 14:24:14 +01:00
Matteo Pagliazzi
4d88787ba0
fix(challenge export): do not fetch users and tasks concurrently
2019-11-02 12:43:51 +01:00
Sabe Jones
6e9ab1dbbb
Merge branch 'release' into develop
2019-11-01 20:14:55 -05:00
Sabe Jones
a2a251b2f1
chore(event): end Fall Festival & Habitoween
2019-11-01 20:13:52 -05:00
Adam Fitzgibbon
dfd79c9c1a
Use username in challenge member dropdown ( #11478 )
...
* update challenge member dropdown and api to display and search by username rather than display name
* remove accidental whitespace
* fix api test
2019-11-01 19:00:42 +01:00
cheng-shiqi
2741721161
Fix: Preventing adding duplicated task ID to taskOrder fix for #11385 ( #11408 )
...
* Preventing adding duplicated task ID to taskOrder object when creating new tasks
* refactor: not using Sets for taskOrderToAdd[]
* refactor: remove unnecessary checking
2019-11-01 19:00:21 +01:00
Sabe Jones
52719ac685
fix(lint): line length
2019-10-31 15:32:20 -05:00
Sabe Jones
d79e0b32d2
feat(event): Habitoween 2019
2019-10-31 15:03:25 -05:00
Sabe Jones
d1afbf4b92
Revert "Minimum password length + Static Pages fixes ( #11474 )"
...
This reverts commit e1d30eec98 .
2019-10-31 13:16:09 -05:00
Matteo Pagliazzi
e1d30eec98
Minimum password length + Static Pages fixes ( #11474 )
...
* password min length: server + client side registering
* tweak text, add tests
* misc
* use red border for invalid inputs
* fix auth form for groups
* remove default firefox box shadown on invalid elements
* fix css in authForm
* fix margings
* misc fixes to forms and buttons
* fix typo
2019-10-30 13:47:35 +01:00
Xaz16
aedabd2266
Fix
...
- Rewrite exports of debuffPotion functions
- Force clear debuffPotions in setDebuffPotionItems to make the same behavior as in develop branch
- Change class of debuffPotion items to shop_{key}
- Resolve lint warnings
2019-10-29 00:27:41 +03:00
Xaz16
60a12e8090
after merge
2019-10-28 23:15:45 +03:00
Sabe Jones
9a4e6a5012
Merge branch 'release' into develop
2019-10-24 15:49:55 -05:00
Sabe Jones
2bcf00fb54
feat(content): Mystery Items 2019-10
2019-10-24 15:36:32 -05:00
Alys
bd121d4286
add swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2019-10-24 20:49:29 +10:00
Matteo Pagliazzi
c3a8305a40
Mentions Fix and Test ( #11475 )
...
* Fix issue with mentioned members not being loaded enough
* mentions: add integration tests and fix saved message
2019-10-24 11:35:15 +02:00
Sabe Jones
2b8e25833d
fix(schema): add missing notif types
2019-10-23 08:10:43 -05:00
Sabe Jones
3031caffe8
fix(tests): bad merge, linting
2019-10-22 12:53:00 -05:00
Sabe Jones
7461a5d509
Merge branch 'release' into develop
2019-10-22 10:37:29 -05:00
Sabe Jones
0dd8cab2a0
feat(content): Zombie color bingo achievements
2019-10-22 10:19:02 -05:00
Matteo Pagliazzi
0133184a83
api: fix notifications update
2019-10-19 18:02:48 +02:00
Matteo Pagliazzi
02d5ad35c6
fix notification
2019-10-18 21:01:40 +02:00
Matteo Pagliazzi
3e12774e40
Merge branch 'develop' into client-monorepo
2019-10-18 20:26:12 +02:00
Matteo Pagliazzi
17b1365853
Improve @mention handling ( #10872 )
...
* move the update username route to v3 (#10836 )
* Add API Call to retrieve auto-complete options for usernames
* Create links to users profile in chat messages
* Begin adding server-side autocomplete to web client
* Add Test to opt out of username being searchable
* Fix issue with username highlighting
* Correctly update message text when using autocomplete
* remove old autocomplete component
* Improve chat input design
* rewrite mongoose migration to avoid using recursion
* fixes
* select more fields
* use lean and .update
* fix(tests): correct expects
* fix(tests): linting & more expects
Also one more tweak for invite validation responsiveness
* chore(news): Bailey
* chore(i18n): update locales
* 4.70.0
* fix(chat): less intrusive highlight and better margins
* fix(chat): more width tweakage
* feat(content): Oddballs Bundle
Also includes one more tweak to @mention text highlighting
* chore(sprites): compile
* chore(i18n): update locales
* 4.71.0
* groupChatReceived webhook fix (#10802 )
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.
* Added test for new functionality.
* Set width on .custom-control-label (#10840 )
Set `width: 100%` on the `.custom-control-label`.
Although `overflow-wrap: break-word` is set on the parent `.checklist-item` element, it doesn't seem to take effect unless a width is set on the label.
* Very large Guild member counts overflow the badge #10753 (#10812 )
* Update superagent to the latest version 🚀 (#10848 )
* fix(package): update superagent to version 4.0.0
* chore(package): update lockfile package-lock.json
* fix(chat): prevent duplicate messages, closes #10823
* Fix for #10814 , prevent ParallelSave errors (#10852 )
* fix(group leave): prevent ParallelSave errors while leaving a group with multiple group or challenge tasks
* fix typo
* move computed-props to methods - refactor mountItem to use the states inside (#10853 )
* feat(content): Frost Hatching Potions
* chore(sprites): compile
* chore(i18n): update locales
* 4.72.0
* fix(stable): remove progress number from petItem
* add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
* more checks on the item.klass, also added the specialClass checks (#10859 )
* feat(content): Turkey Day 2018
* chore(sprites): compile
* chore(i18n): update locales
* 4.73.0
* chore(i18n): update locales
* 4.73.1
* feat(footer): always show expanded footer (#10862 )
* Fixes issue #10857 ("Tags have extra space at the bottom when they should be centered") (#10861 )
* Fix for #10857 centered category tag text
* Fixes #10857 and #10856 display tag markdown.
* Attach client to chat messages (#10845 )
* Attach client to chat messages
* Word
* Design tweaks
* Fix potential error
* chore(event): end Thanksgiving tweaks
* chore(i18n): update locales
* 4.73.2
* Improve chat input design
* Fix test errors
* Move tier icons import to index
* correctly name event variable
* Debounce autocomplete calls
* optimize mention highlighting
* fix failing tests
* Fix sending private messages
* Cache username autocomplete requests
* optimize autocomplete regex
* Fix lint error
* add optional parameters to limit autocompletion to specific group
* Fix non-profile urls not being usable.
* Correctly handle autocomplete for public and private guilds
* Add check to make sure users don’t search for parties/guilds they are not part of
* fix lint error
* limit autocomplete results to 5
* fix(mentioning): change default, adapt settings control to checkbox
* Improve auto completing
* improve username autocomplete
* Fix merge issue
* remove old code
* Send push notifications on mentions
* Improve handling for sending mention notifications
* Fix lint error
* Update schema.js
* Fix failing test
* Don't send push notification to users who aren't in the party
* Remove tributejs from dependencies
2019-10-18 17:05:13 +02:00
Phillip Thelen
360aaa9f0b
Add more achievements to notifications list ( #11332 )
...
* Add more achievements to notifications list
* use addNotification
* Fix logic to not award stable achievements over and over
* Improve achievement display
* Fix setting notifications for party inviter
* Add tests that notifications are added correctly
* Fix tests
2019-10-18 17:04:33 +02:00
Matteo Pagliazzi
94b34f1f80
Merge branch 'develop' into client-monorepo
2019-10-18 17:03:41 +02:00
Sabe Jones
abfcb4ef44
chore(news): Bailey
2019-10-17 15:06:04 -05:00
Sabe Jones
ea9d939577
chore(content): enable Witchy Familiars Bundle
2019-10-15 14:12:18 -05:00
Matteo Pagliazzi
9297685825
move static files & fixes
2019-10-15 18:45:20 +02:00
Matteo Pagliazzi
86eeb3c849
fix index path0
2019-10-15 18:10:20 +02:00
Matteo Pagliazzi
66ecb48cda
move errors
2019-10-15 17:17:44 +02:00
Matteo Pagliazzi
0bac3c0b5f
misc, fix client tests
2019-10-15 15:32:53 +02:00
Phillip Thelen
0d9010572c
Don't send push notification to users who aren't in the party
2019-10-15 12:48:51 +02:00
Matteo Pagliazzi
ed7a54dfd6
move static files
2019-10-14 17:37:44 +02:00
Phillip Thelen
4cccaf33e2
Fix failing test
2019-10-14 16:45:24 +02:00
Phillip Thelen
3a6c296883
Update schema.js
2019-10-14 16:20:52 +02:00
Matteo Pagliazzi
a1e3127d36
fix mongoose issue
2019-10-13 18:31:43 +02:00
Matteo Pagliazzi
a0e5a56bf2
finish linting client
2019-10-13 18:04:04 +02:00
Matteo Pagliazzi
88243a32fa
misc
2019-10-12 14:02:37 +02:00
Matteo Pagliazzi
07cffe9e16
Merge branch 'develop' into client-monorepo
2019-10-11 13:04:17 +02:00
Matteo Pagliazzi
e09a70570e
finish linting server
2019-10-11 13:03:05 +02:00
Matteo Pagliazzi
5aa371bf90
typo
2019-10-10 22:18:40 +02:00
Matteo Pagliazzi
ce4729f069
fixes and start client
2019-10-10 22:15:58 +02:00
Matteo Pagliazzi
8bae0223bb
fix linting for server (except for length of apidoc)
2019-10-10 20:11:50 +02:00
Sabe Jones
00f44b655e
feat(push): add notification types for mobile push
2019-10-10 13:06:59 -05:00
Matteo Pagliazzi
bcf7bcf03c
start linting server
2019-10-09 20:42:16 +02:00
Matteo Pagliazzi
e0e9811ab6
lint common
2019-10-09 20:08:36 +02:00
Matteo Pagliazzi
9cd43db401
Merge branch 'develop' into client-monorepo
2019-10-08 23:01:07 +02:00
Sabe Jones
54e088a097
Merge branch 'release' into develop
2019-10-08 15:36:55 -05:00
Sabe Jones
e47c3211b0
feat(content): enable Fall customizations
2019-10-08 15:36:24 -05:00
Matteo Pagliazzi
621787915c
start upgrading eslint
2019-10-08 16:57:10 +02:00
Matteo Pagliazzi
90c917f69e
fix duplicates in code
2019-10-08 15:05:48 +02:00
Matteo Pagliazzi
90f732f545
Revert "Revert "Fix: Antidotes to Avatar Transformation Items should be added to Rewards by API ( #11353 )" ( #11406 )"
...
This reverts commit 50cae0165c .
2019-10-07 16:55:55 +02:00
Matteo Pagliazzi
50cae0165c
Revert "Fix: Antidotes to Avatar Transformation Items should be added to Rewards by API ( #11353 )" ( #11406 )
...
This reverts commit 5b57d91a9b .
2019-10-07 16:55:44 +02:00
Aleksey
5b57d91a9b
Fix: Antidotes to Avatar Transformation Items should be added to Rewards by API ( #11353 )
...
* Fix: moved debuffPotions from vue component
- Move logic of choosing proper debuf potion from vue component to website commons
- introduce new function to get debuffSpellItems
* Fix: move debuffPotions to server
* Refactoring: move setting of debuff potion to func
* Fix: sanity
* Refactoring & Tests:
- Create test case for get and set DebuffPotionItems functions
- Fix setDebuffPotionItems function to not create duplicated debuff items
- Make debuff potion type of items unpinnable
- Move list of debuffs to constant to reuse it in tests and functions
* Fix: typo in test describe
* Fix: translation of unpin
* Fix: setDebuffPotionItems on cron buffs reset
* Fix: use full path for debuff potions
2019-10-06 18:41:39 +02:00
Matteo Pagliazzi
16c8825b2b
Hall Fixes ( #11403 )
...
* fix(hall): correctly casts owned gear and mounts
* typo
2019-10-06 17:08:11 +02:00
Sabe Jones
df0a633b09
Merge branch 'develop' into release
2019-10-03 14:05:28 -05:00
Sabe Jones
cc8d3a9f36
chore(event): enable Sparkles
2019-10-03 14:04:02 -05:00
Matteo Pagliazzi
d19b3857ee
fix unit tests
2019-10-03 17:24:17 +02:00
Matteo Pagliazzi
5b406ba70f
remove need for babel register in clientside
2019-10-02 23:19:24 +02:00
Matteo Pagliazzi
db02712c98
fix babel and remove unused deps
2019-10-02 20:09:26 +02:00
Matteo Pagliazzi
45f7cf04ab
remove old module.exports from server aswell
2019-10-02 19:45:27 +02:00
Sabe Jones
8308f88865
Merge branch 'release' into develop
2019-10-01 19:02:49 -05:00
Sabe Jones
3c7d3aafe5
feat(content): Armoire and BGs
2019-10-01 18:58:40 -05:00
Phillip Thelen
e2781964bb
Fix lint error
2019-10-01 13:26:42 +02:00
Phillip Thelen
2d3f2500e8
Improve handling for sending mention notifications
2019-10-01 13:26:38 +02:00
Phillip Thelen
77b188833e
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
...
# Conflicts:
# website/server/controllers/api-v3/chat.js
# website/server/libs/pushNotifications.js
# website/server/models/user/schema.js
2019-10-01 12:55:41 +02:00
Sabe Jones
a715ec1a0f
Merge branch 'release' into develop
2019-09-30 13:25:44 -05:00
Sabe Jones
2db03da7b4
fix(quests): remove outdated items from shop
...
Also Bailey news
2019-09-30 13:24:32 -05:00
Sabe Jones
c5690e5ea9
Merge branch 'sabrecat/kickstarter-2019' into release
2019-09-30 13:07:18 -05:00
Phillip Thelen
bbbe0cca09
Add push notification for party activity ( #11319 )
...
* Add push notification for party activity
* Improve inbox notifications
* move sendChatPushNotifications method
* Fix import
* Fix failing test
* Improve notification display on iOS
* correctly set push notification environment
2019-09-30 19:36:22 +02:00
Phillip Thelen
0072a3968d
Send push notifications on mentions
2019-09-30 15:10:20 +02:00
Phillip Thelen
c4f44fce4c
Add missing translations from transifex ( #11367 )
...
* Add missing translations from transifex
* update i18n tests
* fix lint error
2019-09-29 18:46:01 +02:00
negue
e1abeeb78a
load user info per conversation.id - 2nd try ( #11374 )
...
* load user info per conversation.id
* fix projection
* load user data based on / from conversations
* fix tests
* remove unneeded properties of 2nd query
2019-09-29 18:45:46 +02:00
Phillip Thelen
17e8b0a0fd
Improve wording for push notifications ( #11378 )
2019-09-29 18:45:30 +02:00
Sabe Jones
ef1e7ba336
feat(kickstarter): add achievement
2019-09-27 11:45:24 -05:00
Sabe Jones
de5669dfec
feat(content): Magic Hatching Potions
2019-09-26 14:47:26 -05:00
Sabe Jones
01d272d2c4
Teams Updates 201908 ( #11347 )
...
* fix(teams): no hover bg change for noninteractive checkboxes
* feat(teams): send notification to managers on task claim
Also fix client unit test broken by prev commit
* feat(groups): don't penalize for tasks assigned since last activity
* fix(tests): actually fix client unit
* fix(teams): improve task styles
* fix(teams): let people other than leader see relevant approvals
Also more style fixes
* fix(approvals): better filtering and task headings for approval data
* fix(test): correct test expectations for new GET /approvals behavior
* fix(groups): style tweaks
* different border for group and normal tasks
* fix(teams): remove extra click for claiming
* fix(teams): leaders & managers can check off approval-required tasks
* fix(teams): don't notify user of own claim
* fix group task margin and z-index on hover
* fix(menu): sporadic error in top bar
* fix(teams): more approval header and footer adjustments
* fix(tests): adjust expectations for self-approval
* fix(teams): address PR comments
* refactor(timestamps): date user activity on authenticated requests
* refactor(timestamps): update local user instead of direct db update
2019-09-26 14:49:11 -04:00
negue
5f2032a9d5
Style fixes: Onboarding ( #11241 )
...
* wip: createIntro / onboard ui rework
* extract more methods - working body settings component
* move justin above the dialog
* extract submenu + fix styles
* white background on items, working example of "none" item, item border radius
* extract options as component
* move more subMenu's to the component
* add chair margins
* move tasks to common/content
* add menu indicator
* extract more parts of onboarding-intro
* refactor / fully converted hair-settings
* extract extra-settings
* fix sprite positions / lint
* extract task-strings to be translatable
* style fixes - hide submenu's if not editing
* style / margin fixes
* more style fixes
* show hair styles at onboarding - use arrowleft/right as svg instead of image fix next color
* finish button style - full set background/purchase button
* fix footer - prev/next hover
* Add Default Tasks + `byHabitica` property
* customize-options click item on the full zone
* purple tasks
* footer animation => none
* fix onboarding task habit up/down
* onboarding circle color/position
* task styles
* fix onboarding position
* show seasonal options
* add hover to (locked-) options
* added the correct behavior of shop-items to onboarding options
* hide hover on active options
2019-09-26 12:43:47 +02:00
Sabe Jones
8640f452e9
Merge branch 'release' into develop
2019-09-25 09:03:16 -05:00
Sabe Jones
ba4d057312
feat(content): Subscriber Mystery Items 2019-09
2019-09-25 09:02:45 -05:00
Sabe Jones
70e672df93
Merge branch 'release' into develop
2019-09-24 18:46:51 -05:00
Sabe Jones
88b8f20d12
feat(event): Fall Festival 2019
2019-09-24 18:41:00 -05:00
Matteo Pagliazzi
3948f63290
Revert "load user info per conversation.id ( #11368 )" ( #11372 )
...
This reverts commit f3372716d9 .
2019-09-22 13:11:52 +02:00
Matteo Pagliazzi
d93d295d9f
security: add default security headers provided by helmet.js ( #11358 )
2019-09-20 18:10:38 +02:00
negue
f3372716d9
load user info per conversation.id ( #11368 )
...
* load user info per conversation.id
* fix projection
2019-09-20 17:37:36 +02:00
Matteo Pagliazzi
4690431384
Merge pull request #11354 from HabitRPG/upgrade-stripe
...
Upgrade Stripe
2019-09-20 16:49:59 +02:00
Matteo Pagliazzi
2a9f5e1667
remove BETA comment and fix tests
2019-09-20 16:44:46 +02:00
Matteo Pagliazzi
7b69967412
Merge branch '11290-get-webhooks-api' of https://github.com/cvuorinen/habitica into cvuorinen-11290-get-webhooks-api
2019-09-20 16:38:42 +02:00
Sabe Jones
4afe0cf130
chore(news): Bailey
2019-09-19 14:56:48 -05:00
Phillip Thelen
6523b6b342
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
...
# Conflicts:
# package.json
# website/client/components/chat/autoComplete.vue
# website/client/components/chat/chatCard.vue
# website/client/components/groups/chat.vue
# website/server/controllers/api-v3/chat.js
# website/server/controllers/api-v3/members.js
# website/server/controllers/api-v4/members.js
2019-09-19 16:08:13 +02:00
Sabe Jones
7d732b5612
feat(content): new pet color achievements
2019-09-17 16:10:32 -05:00
Carl Vuorinen
85ec9e9bfb
Add API endpoint to get user's webhooks
...
Closes #11290
2019-09-14 20:24:11 +03:00
Sabe Jones
acb409245a
Merge branch 'release' into develop
2019-09-10 17:20:54 -05:00
Sabe Jones
3f2b3da449
feat(content): Rocking Reptiles Bundle
2019-09-10 17:20:06 -05:00
Matteo Pagliazzi
cb6fdd4a15
upgrade stripe to v7
2019-09-10 15:02:02 +02:00
Matteo Pagliazzi
d59b81c15b
Merge pull request #11330 from HabitRPG/feature/inbox/last-message
...
Conversation-API: Add last message
2019-09-09 17:08:13 +02:00
Sabe Jones
271fc72028
chore(news): Kickstarter Bailey
2019-09-05 14:40:20 -05:00
Sabe Jones
6482b01c2e
feat(content): Armoire and Backgrounds
2019-09-03 16:07:38 -05:00
Sabe Jones
2f4ebdac10
chore(news): Bailey
2019-08-30 13:46:30 -05:00
Sabe Jones
0056163a17
chore(news): Bailey
2019-08-29 14:31:42 -05:00
Sabe Jones
fc841d0ad4
Hourglass Quest ( #11325 )
...
* feat(content): Hourglass Quest
* fix(hourglasses): NaN from undefined
* fix(quests): sanity check for negative scrolls
* fix(hourglasses): don't show quantity selection for binary items
* fix(route): validate number, use body not params
* test(timetrav): add quest tests
2019-08-29 15:22:12 -04:00
Sabe Jones
8b9c7da5dc
Merge branch 'release' into develop
2019-08-27 16:00:52 -05:00
Sabe Jones
3bcd82f6fe
feat(content): Mystery Items
2019-08-27 16:00:02 -05:00
negue
403efd4ddc
add api doc
2019-08-27 18:33:27 +02:00
negue
ba196f70a3
remove orderBy-import
2019-08-25 18:18:08 +02:00
negue
a2d2972898
refactor: conversation mongo query - add text/userStyle/contributor - sort inside
2019-08-25 18:16:27 +02:00
Sabe Jones
2ced5e2d5b
Merge branch 'release' into develop
2019-08-23 11:34:20 -05:00
Sabe Jones
fd8f144da0
chore(news): KS update
2019-08-23 11:33:56 -05:00
Sabe Jones
38f17f0b6a
Merge branch 'release' into develop
2019-08-20 11:23:19 -05:00
Sabe Jones
ccde367a06
chore(news): Kickstarter announcement
2019-08-20 10:30:31 -05:00
Matteo Pagliazzi
e621e781ed
Node 12 ( #11149 )
...
* chore(node): upgrade to version 12
* update package-lock.json
* upgrade bcrypt
* upgrade node-sass
* update deps
* fix deprecation
* downgrade amplitude
* fix client side tests
* fix common and integration tests, upgrade mongoose
2019-08-19 22:43:17 +02:00
Scens
c8466eec98
Only includes backticks if they haven't been already included. Fixes … ( #11250 )
...
* Only includes backticks if they haven't been already included. Fixes the problem.
* Small adjustments
2019-08-15 11:10:24 -04:00
Jawad Jahangir
5a83f93ade
Free group plan subscription from a party/guild no longer gets cancelled after leaving a guild - fixes #11055 ( #11228 )
...
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* Added tests to check if a member of a group plan maintains free subscription when leaving another group without a plan
* Added tests to check if member of a group plan still keeps free subscription when leaving some other group without a plan
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* Added tests to check if a member of a group plan maintains free subscription when leaving another group without a plan
* Added tests to check if member of a group plan still keeps free subscription when leaving some other group without a plan
2019-08-15 11:06:56 -04:00
Phillip Thelen
04420aa60e
Always send push notifications in recipients language ( #11307 )
...
* Load data needed for members when inviting to quest
* Always send push notifications in recipients language. Fixes #8718
* Remove console.log
2019-08-15 11:00:46 -04:00
Sabe Jones
4de8e9a3fd
chore(news): Bailey
...
Also adds target:_blank to some Tavern links
2019-08-15 09:47:52 -05:00
Sabe Jones
1aef294646
feat(content): Silver Hatching Potion quest
2019-08-13 19:16:19 -05:00
Sabe Jones
63f9304abf
fix(mobile): set default streak achievement to 0
2019-08-12 16:02:23 -05:00
Sabe Jones
41782b2157
feat(content): re-enable Farm Friends bundle
2019-08-08 15:47:33 -05:00
Sabe Jones
e2385bd1fd
Merge branch 'release' into develop
2019-08-06 16:59:08 -05:00
Sabe Jones
12432bee91
feat(content): Armoire and Backgrounds 08/2019
2019-08-06 16:43:52 -05:00
Sabe Jones
07ae4134f3
Squashed commit of the following:
...
commit 0db0a69f0fa00d831b7d90340e045097e8d92343
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jul 16 10:01:49 2019 -0500
fix(groups): return 0, not empty, when skipping downscore on Dailies
fixes #11231
commit 1bf5bc714f660345f37bcc4e3587143341521c65
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jul 16 09:48:28 2019 -0500
fix(groups): correct task creation button
commit 90908211200bc4a3eb204178df5c812ffcd09f37
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jul 16 09:46:04 2019 -0500
fix(groups): clear approval status at cron for Habits and Dailies
commit 57e8dd0252c3ea45dd6fa1a7670ee197f32e76e5
Merge: d31b0a2d0 c9a56e8f3
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jul 16 09:33:27 2019 -0500
Merge branch 'develop' into sabrecat/group-tasks
commit d31b0a2d0e3b7a46235696e9b05fa734ac29a2e5
Merge: f2185a91b 043696c22
Author: SabreCat <sabrecat@gmail.com>
Date: Mon Jun 24 14:58:26 2019 +0000
Merge branch 'develop' into sabrecat/group-tasks
commit f2185a91bde554c7eb22cd6bdfc1ef9227f1e765
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jun 18 10:10:10 2019 -0500
fix(groups): divide task delta by number of assigned users
commit af0cde52f22129312d0102ecc5571f59aa2e396e
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jun 18 10:06:01 2019 -0500
fix(groups): remove chat spam
commit c1c810967a9e34155948a9164862125517372268
Merge: bf4f3fb08 f987585cf
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jun 18 08:15:28 2019 -0500
Merge branch 'develop' into sabrecat/group-tasks
commit bf4f3fb08491b4c4e1dbfaa58a2a6510c3cb78aa
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu May 23 11:29:01 2019 -0500
fix(test): expect new task class from store
commit ae0379c80519523f68d4d606e1cc4bed8e9e49ec
Merge: ce5096e11 664cf5a47
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu May 23 11:25:15 2019 -0500
Merge branch 'develop' into sabrecat/group-tasks
commit ce5096e116558419e4a73e8b23a58c78a1f2ab9b
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu May 23 11:02:01 2019 -0500
feat(group-plans): clarify non-interactive controls on task board
commit ff3cec9530e30d51c43171d6f97d3888ff200352
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue May 21 11:10:50 2019 -0500
feat(group-plans): score shared task when user scores it
2019-08-02 15:49:41 -05:00
Sabe Jones
90e89791f3
chore(event): end Summer Splash
2019-08-01 18:08:43 -05:00
Sabe Jones
20298d3dd5
Merge branch 'release' into develop
2019-07-31 13:14:34 -05:00
Sabe Jones
016c8307df
chore(event): Naming Day 2019
2019-07-31 13:13:27 -05:00
Alys
c80de38572
add shadow-muting chat hiding feature (automatic flagging of public posts from shadow-muted players) - fixes 10851 ( #11239 )
...
* move existing tests for chatRevoked users to 'mute user' describe block
* give consistent names to chatRevoked tests and use const not let
* improve methods for restoring chat permissions to test users
* add tests for shadow-muting and define constants for flag-related numbers
* update user profile URLs and reverse private/public 'if' statements
* implement shadow muting in the API and schemas
* add interface for mods to turn shadow muting on/off for a user
- checkbox in the Hall
- icon in the user's profile
* mark chat posts as being shadow muted (marking is visible to mods only)
* convert Admin Tools in profile from icons to text; make crown icon a toggle
* move logic for displaying flag count to a computed property
* prevent chat notifications for shadow-muted posts
2019-07-30 19:09:42 +02:00
Sabe Jones
21d27d223c
feat(content): Mystery Items July 2019
2019-07-25 14:58:07 -05:00
Sabe Jones
b0bb537501
Merge branch 'release' into develop
2019-07-22 16:38:07 -05:00
Matteo Pagliazzi
931e2565b6
Use mandrill for password resets and usernames in emails ( #11277 )
...
* use mandrill for password resets
* fix email id
* fix username in emails and tests
* fix tests
* fix package-lock
2019-07-22 19:44:01 +02:00
Sabe Jones
c99d62228f
Merge branch 'release' into develop
2019-07-17 14:20:54 -05:00
Sabe Jones
61c78355bd
feat(content): enable Splashy Pals Bundle
2019-07-17 14:20:21 -05:00
negue
c9a56e8f3e
Performance/inbox paging ( #11258 )
...
* merge all changes to one commit of PR #11157 / #11226
* rename the new paged messages route
* rename event, move map-method to the Inbox schema, fix lint
* move `mapMessage`-call to `getUserInbox`
* revert schema.method back to a normal one
2019-07-15 11:25:22 +02:00
Forrest Hatfield
684a615a07
Allow admins to edit challenge tasks - fixes #8149 ( #10658 )
...
* Allow admins to edit challenges
* add test for admin creating a task in a challenge they don't own
2019-07-12 15:56:09 +02:00
Jonathan Duncan
0cd0bcf874
Fixed typo. ( #11219 )
2019-07-09 16:28:12 +02:00
Alys
544a703df5
Minor fixes for apidocs and comments ( #11249 )
...
* improve comments for api.getUserChallenges
* clarify members parameter when creating test guilds
I was uncertain about this parameter and read the code to clarify it.
Reading a comment is easier. :)
* add "Custom Day Start time" to api route's title as it's the common name
2019-07-09 16:18:41 +02:00
Sabe Jones
b1b90d6dba
feat(content): backgrounds and Armoire items
2019-07-02 13:30:33 -05:00
Sabe Jones
18e4e11a95
chore(news): Bailey
...
and extend a couple of items by 1 day
2019-07-01 14:53:40 -05:00
SabreCat
0e253fbb06
feat(content): mystery items
2019-06-25 15:13:08 +00:00
Sabe Jones
fcfc44fd13
feat(content): Watery Potions
...
also fixes some sprite issues
2019-06-20 15:13:19 -05:00
Sabe Jones
8e9500fed2
feat(event): Summer Splash 2019
2019-06-18 19:20:14 -05:00
Sabe Jones
377f849f9e
Merge branch 'free-rebirth-limit' into release
2019-06-18 16:02:12 -05:00
Matteo Pagliazzi
2cbb0a85a4
limit free rebirth to once every 45 days
2019-06-17 20:37:18 +02:00
Sabe Jones
5a5f1d6895
Revert "Performance: Inbox Paging / loading ( #11157 )"
...
This reverts commit 5630e8cc8e .
2019-06-14 12:34:38 +00:00
Sabe Jones
6b59262e3e
Challenge privacy fix ( #11222 )
...
* fix(challenges): filter out private content API-side
* fix(challenges): cleaner fix + test
2019-06-13 09:27:47 -05:00
negue
5630e8cc8e
Performance: Inbox Paging / loading ( #11157 )
...
* load messages per conversation
* only sort ones in ui
* add contributor to message
* fix correct message layout/message
* mugenScroll on chatMessages
* fix lint, no mugen-scroll, use own scroll handler
* fix height / margin of modal + use button to load more
* fix tests
* user data from inbox
* style "load earlier messages"
* move mapMessage to the inbox api result / extract sentMessage of members-api-controller
* fix test back
* fix test
* keep last scroll position
* just set the Id of the returned message instead of all other properties
* fix add new messages (buttons were hidden) + load more
* item-mounted debounce to trigger the re-scrolling
2019-06-13 15:18:50 +02:00
Matteo Pagliazzi
5268bbb8a9
fix(subscription): reset lastReminderDate when creating a new subscription
2019-06-12 17:21:08 +02:00
Sabe Jones
424c50f2a4
chore(news): Bailey
...
also direct mod contact form to HTTPS
2019-06-11 15:26:38 -05:00
Sabe Jones
f235a64d96
Merge branch 'sabrecat/pet-achievements' into release
2019-06-11 15:12:34 -05:00
Sabe Jones
286abe334e
fix(notifications): add missing enum
2019-06-11 14:50:17 -05:00
Sabe Jones
81333a3074
feat(notifications): alert user to achievements
2019-06-11 13:06:00 -05:00
Matteo Pagliazzi
3c31945524
Email subs reminders release ( #11216 )
...
* add subscriptions reminders emails
* add field to record the last sub reminder
2019-06-10 22:37:30 +02:00
Sabe Jones
a0b6f576d2
Merge branch 'release' into develop
2019-06-04 16:49:17 -05:00
Sabe Jones
77b19ffe97
feat(content): Armoire items and Backgrounds June 2019
2019-06-04 16:48:05 -05:00
Sabe Jones
e9a5e084fc
fix(tests): use baseline quest with fewer update calls
2019-06-04 16:09:01 -05:00
Sabe Jones
12250a93f1
feat(basic-auth): allow multiple auth pairs ( #11204 )
2019-06-04 15:52:25 -05:00
Sabe Jones
7094e75dd8
feat(achievements): new pet-related cheevos
2019-06-04 10:31:25 -05:00
Sabe Jones
74c93955f8
Merge branch 'release' into develop
2019-06-03 15:22:54 -05:00
Sabe Jones
a26c2bce23
chore(date): Bailey and disable potions
2019-06-03 15:22:21 -05:00
greenkeeper[bot]
3c442318d8
Update js2xmlparser to the latest version 🚀 ( #11019 )
...
* fix(package): update js2xmlparser to version 4.0.0
* chore(package): update lockfile package-lock.json
* fix package-lock
* fix js2xmlparser usage
2019-06-01 14:45:05 +02:00
greenkeeper[bot]
fd3f7e2b0e
Update pageres to the latest version 🚀 ( #10981 )
...
* fix(package): update pageres to version 5.0.0
* chore(package): update lockfile package-lock.json
2019-06-01 14:40:53 +02:00
Sabe Jones
36cc229dd2
Merge branch 'develop' into release
2019-05-30 15:13:57 -05:00
Sabe Jones
3a8312832c
feat(content): new freebie glasses
...
Fixes #11171
2019-05-30 15:13:23 -05:00
Sabe Jones
df17753bb6
Merge branch 'release' into develop
2019-05-28 15:48:51 -05:00
Sabe Jones
251e1d45af
feat(content): May 2019 subscriber set
2019-05-28 15:45:04 -05:00
Matteo Pagliazzi
7baa7427a0
Merge pull request #11178 from Alys/mute-ban-block-notification-messages
...
adjust error messages for muted and banned users, and system flagging error
2019-05-26 11:49:24 +02:00
Matteo Pagliazzi
270078a030
Merge pull request #11170 from HabitRPG/Yutsuten-party-chat-translations
...
Party Chat Translations (Continuation of #10019 )
2019-05-26 11:45:12 +02:00
Alys
ec75de5a90
add swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2019-05-26 16:25:33 +10:00
Alys
b9b944ba29
replace similar messages about chat privileges removed with one generic one
2019-05-26 07:59:23 +10:00
Sabe Jones
8c005aa05a
fix(shops): remove outdated Featured Item
...
and Bailey
2019-05-23 13:40:06 -05:00
Sabe Jones
01657f573d
feat(quests): create Hatching Potion category
2019-05-21 14:48:44 -05:00
Sabe Jones
8498ab9fe2
chore(news): Bailey
2019-05-16 14:07:39 -05:00
Matteo Pagliazzi
eff8db0afd
fix issue with language being undefined, refactoring auth middleware, new tests
2019-05-15 16:54:55 +02:00
Matteo Pagliazzi
8cce38ede1
Merge branch 'party-chat-translations' of https://github.com/Yutsuten/habitica into Yutsuten-party-chat-translations
2019-05-15 15:20:40 +02:00
Mateus Etto
ab0dae8df3
Translate messages only after serialization
2019-05-15 21:26:23 +09:00
Mateus Etto
0824af05b7
Remove unneeded parameter on method call
2019-05-15 19:45:42 +09:00
Mateus Etto
28bf024990
Move translateMessage to libs
2019-05-15 19:07:17 +09:00
Mateus Etto
8a30ac0607
Add translation support for quest cancel
2019-05-15 16:55:37 +09:00
Mateus Etto
0360326f41
Change translateSystemMessages to be a class method
2019-05-15 15:46:32 +09:00
Mateus Etto
f3f215abea
Fix typo on schema
2019-05-15 13:50:57 +09:00
Sabe Jones
977968df19
feat(content): Sunshine Potions
2019-05-14 16:33:42 -05:00
Sabe Jones
5a473eb0e0
Merge branch 'develop' into release
2019-05-09 14:32:14 -05:00
Sabe Jones
09e748bc92
feat(content): reenable Feathered Friends bundle
2019-05-09 14:27:22 -05:00
Sabe Jones
90532b0763
Merge branch 'develop' into Yutsuten/party-chat-translations
2019-05-08 15:13:53 -05:00
Sabe Jones
aa61c1fe06
Merge branch 'release' into develop
2019-05-07 15:57:44 -05:00
Sabe Jones
b2dabcaf98
feat(content): Armoire items and backgrounds 5/19
2019-05-07 15:56:51 -05:00
negue
f84562446d
fix loading owned messages ( #11147 )
2019-05-03 15:53:35 +02:00
HydeHunter2
c0837e3b3c
Fix challenge update ( #11148 )
...
* Fix challenge update
Fix some problem in challenge update
* Fix test
* Move leader to noUpdate
* Move leader to noUpdate
2019-05-03 15:35:56 +02:00
HydeHunter2
95c1893b0c
Fix challenge update ( #11148 )
...
* Fix challenge update
Fix some problem in challenge update
* Fix test
* Move leader to noUpdate
* Move leader to noUpdate
2019-05-03 15:35:12 +02:00
Sabe Jones
0ce11b82df
Merge branch 'develop' into release
2019-05-02 14:25:02 -05:00
Sabe Jones
4777850601
chore(event): end Flinging
2019-05-02 14:24:29 -05:00
Sabe Jones
9a3e208c9b
Merge branch 'release' into develop
2019-04-30 14:17:32 -05:00
Sabe Jones
53515fd3f4
chore(news): Bailey
2019-04-30 14:17:05 -05:00
Sabe Jones
1135ab946e
Sabrecat/groups quick wins ( #11146 )
...
* WIP(groups): quickish wins
* WIP(groups): two quick wins
1. Don't show task creation button if user is not leader or manager
2. Don't require JS confirm() for approving tasks
* fix(group-plans): allow delete from options button
* fix(group-plans): update tasksOrder when task deleted
* fix(group-tasks): dismiss notification when user takes action
* refactor(tasks): DRY out create button styling
* fix(group-tasks): sync after claiming/unclaiming
* fix(claiming): better sync and notif handling
* fix(tasks): force sync instead of explicitly clearing notif
* fix(tasks): reposition task creation button
* fix(group-tasks): default to single completion
* fix(group-tasks): move completion condition field above approval switch
* fix(group-tasks): todo validation error and approval notif dismissal
* fix(group-tasks): default single completion on client
* fix(group-tasks): move completion condition up more
* fix(group-tasks): maintain client-side user assignment list
* fix(group-tasks): remove approval notifications when task deleted
* fix(group-tasks): send assigned task to top of task list
* fix(group-tasks): remove useless tag filter dropdown
* feat(group-tasks): notify user of assigned task
* fix(group-tasks): don't allow approval of tasks w/ no approval request
* fix(tests): adjust expectations
* fix(group-tasks): more sensible action on assignment notif click
2019-04-29 13:38:28 -05:00
negue
83070e211d
Inbox: Add API to list conversations ( #11110 )
...
* Add API to list inbox conversations
* fix test + add api doc
* use `.lean()`
* orderBy after the the grouped conversations are loaded
* fix ordering
2019-04-26 18:45:05 +02:00
Matteo Pagliazzi
9d473cc92e
wip: fix setting (some) items values in the hall of heroes ( #11133 )
2019-04-25 22:41:43 +02:00
Sabe Jones
cbb04d221d
Merge branch 'develop' into release
2019-04-25 13:55:17 -05:00
Sabe Jones
0f374abd27
feat(content): subscriber mystery set
2019-04-25 13:42:49 -05:00
Sabe Jones
a4a8ac6c5e
Merge branch 'release' into develop
2019-04-23 15:30:37 -05:00
Sabe Jones
82cd53f8cb
chore(news): Bailey
2019-04-23 15:29:15 -05:00
Phillip Thelen
821fc1d9c0
Fix 500 server error when trying to log in with wrong username ( #11126 )
2019-04-23 18:38:56 +02:00
Phillip Thelen
2dca2148f4
improve username autocomplete
2019-04-22 09:07:28 +02:00
Matteo Pagliazzi
bd3de3c48c
Spells Performances ( #11104 )
...
* spells: only select needed fields
* fix tests
* add comment
2019-04-19 16:18:32 +02:00
Sabe Jones
f16e0bd044
chore(news): Bailey
...
also conclude email A/B testing
2019-04-18 14:15:28 -05:00
Sabe Jones
43b607aedd
fix(tasks): force sync instead of explicitly clearing notif
2019-04-18 13:09:59 -05:00
Sabe Jones
4c832ad36c
fix(claiming): better sync and notif handling
2019-04-18 13:09:59 -05:00
Sabe Jones
76ae41875d
Group Plans quick wins ( #11107 )
...
* WIP(groups): quickish wins
* WIP(groups): two quick wins
1. Don't show task creation button if user is not leader or manager
2. Don't require JS confirm() for approving tasks
* fix(group-plans): allow delete from options button
* fix(group-plans): update tasksOrder when task deleted
* fix(group-tasks): dismiss notification when user takes action
* refactor(tasks): DRY out create button styling
* fix(group-tasks): sync after claiming/unclaiming
2019-04-15 10:48:27 -05:00
HydeHunter2
7a5a856ac6
Add message of cancelled quest in party chat ( #11106 )
...
* Add message of cancelled quest in party chat
Issue #11093
* Delete trailing spaces
For successful passing the test
* Add test of cancelled quest's message
Also, added an explanation that partyMembers[1] hasn't accepted the invitation in the 'cancels a quest' test
* Fix: import Group
Import Group to pass Lint syntax test
* Move save function to Promise.all
* Fix moving save to Promise.all
2019-04-14 17:55:20 +02:00
Sabe Jones
8d0060d511
chore(news): Bailey
2019-04-11 13:05:04 -05:00
negue
4289becccc
Performance: My Challenges ( #11065 )
...
* use the same paging for "myChallenges" only loads 10 per call
* challenges: show loading above the load-more button (instead at the top)
* purple loading message and flat load-more button
* remove comment
* show loadMore button only when the request has 10 entries
* challenge card ui
2019-04-10 22:09:04 +02:00
Sabe Jones
924723bce6
feat(content): Garden Potions and Spring Avatar Customizations
2019-04-09 14:59:30 -05:00
Alys
f09b65e108
add swear word - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
...
This adds "pewdiepie" to the list of banned words because
"subscribe to pewdiepie" is semi-common spam in the Tavern,
and because there is sometimes hate speech in the YouTube
channel and in some material posted by pewdiepie's fans.
2019-04-03 20:54:58 +10:00
Matteo Pagliazzi
e10655a5b4
fix(logs): fix FCM logging
2019-04-02 23:19:01 +02:00
Sabe Jones
d25a5fcd57
Merge branch 'release' into develop
2019-04-02 15:55:35 -05:00
Matteo Pagliazzi
6c4e1a326f
fix(logger): log promise in unhandledRejection event
2019-04-02 22:32:57 +02:00
Sabe Jones
9cf8c0a824
Merge branch 'release' into develop
2019-04-02 13:09:46 -05:00
Sabe Jones
df7c0a005c
feat(content): Armoire and Backgrounds March 2019
2019-04-02 13:08:40 -05:00
Matteo Pagliazzi
c60481ab34
Amplitude fixes v2 ( #11100 )
...
* fix(analytics): properly catch and log errors
* misc
* refactor
* more refactor
* fallback for user id
* fix tests
2019-04-02 18:44:39 +02:00
Sabe Jones
b2e834c74c
Merge branch 'release' into develop
2019-04-02 07:54:59 -05:00
Sabe Jones
2419b219ba
chore(event): end April Fool's
...
and fix end date of Gala items
2019-04-02 07:53:37 -05:00
Matteo Pagliazzi
0b8ce63c76
WIP: Improve User model performances ( #10832 )
...
* wip: define items as mixed objects
* add default owned gear
* mark modified
* more mark modified
* more mark modified
* more mark modified
* more mark modified
* fix common tests
* fix common tests
* update mongoose
* add itemsUtils
* use new util function in hall controller
* add tests for items utils
* update website/server to mark all items as modified
* start updating common code
* update login incentives
* update unlock
* remove changes to package-lock.json
* remove changes to package.json
2019-04-01 19:24:18 +02:00
Sabe Jones
95e541ae75
Merge branch 'release' into develop
2019-04-01 10:27:24 -05:00
Sabe Jones
07e4b2c463
fix(event): include stable
2019-04-01 10:24:55 -05:00
Sabe Jones
e749e42665
feat(event): April Fools 2019
2019-04-01 10:17:05 -05:00
negue
0b82722d27
performance: private messages - API ( #11077 )
...
* paging for inbox
* clean up
2019-03-31 20:52:53 +02:00
Sabe Jones
0d12686a10
chore(news): Bailey
2019-03-29 13:57:02 -05:00
Sabe Jones
e58fbcc34c
chore(news): Bailey
2019-03-28 16:23:11 -05:00
Sabe Jones
fc08b753cd
Merge branch 'release' into develop
2019-03-26 20:23:22 -05:00
Sabe Jones
50278db1d6
feat(content): Mystery Items March 2019
2019-03-26 20:22:26 -05:00
Matteo Pagliazzi
abb8dc4dc1
Merge pull request #11078 from ChesterSng/11602-display-message-when-social-auth-acc-uses-password
...
Fixes #11062 Display information message when social authentication account uses password to login
2019-03-23 18:36:12 +01:00
Matteo Pagliazzi
2f792d51f8
Merge pull request #11069 from randi2kewl/11047-hall-search-case-insensitive
...
Fixes #11047 Hall search case insensitive
2019-03-23 18:22:53 +01:00
Matteo Pagliazzi
6cc925b535
Merge pull request #10988 from HabitRPG/sabrecat/platform-analytics-tweak
...
Set registered platform on analytics only once
2019-03-23 18:19:15 +01:00
Chester Sng
3e45f5af41
Add check for the existence of user's password before attempting to authenticate
2019-03-22 19:30:00 +08:00
Sabe Jones
928327e02a
feat(content): Magic Hatching Potions March 2019
2019-03-21 16:34:19 -05:00
Sabe Jones
e0291cf432
feat(event): Spring Fling 2019
2019-03-19 19:52:59 -05:00
Sabe Jones
d178928c45
fix(analytics): remove excess promise layer
2019-03-18 15:51:49 -05:00
Randi Miller
e083df64e4
fixes #11047 Switches Hall query to use lowercase name
2019-03-17 04:00:50 -04:00
Sabe Jones
2a225c2376
chore(event): end Pi Day
2019-03-15 10:31:08 -05:00
Sabe Jones
3f04c8abf5
chore(email): next split test iteration
2019-03-14 12:21:46 -05:00
Sabe Jones
0d374d817c
chore(email): end split test
2019-03-14 07:02:45 -05:00
Sabe Jones
ae2d50c5b8
feat(pie): immediate pie for new users
2019-03-14 06:51:47 -05:00
Sabe Jones
8bcd93075b
chore(news): Bailey
2019-03-12 19:29:51 -05:00
Sabe Jones
6668aae89b
feat(event): Pi Day
2019-03-12 17:10:38 -05:00
Phillip Thelen
51f66af320
Improve auto completing
2019-03-06 12:59:57 +01:00
Sabe Jones
201085651b
Merge branch 'release' into develop
2019-03-05 15:44:04 -06:00
Sabe Jones
9c797e6a54
feat(content): Armoire and Backgrounds March 2019
2019-03-05 15:43:19 -06:00
Sabe Jones
e6c3d00665
fix(emails): send split-test mailings for social reg accounts
2019-03-05 14:55:45 -06:00
Matteo Pagliazzi
080c4b3e20
Merge branch 'develop' into negue/flagpm
2019-03-03 17:12:11 +01:00
Sabe Jones
55bd35d7d3
chore(monthly): announce Challenges, end potions
2019-03-01 16:22:19 -06:00
Sabe Jones
4a66e2fbe0
fix(mentioning): change default, adapt settings control to checkbox
2019-03-01 07:05:06 -06:00
Sabe Jones
75f6398de2
chore(news): Bailey
2019-02-28 16:02:46 -06:00
Phillip Thelen
5e50e98738
limit autocomplete results to 5
2019-02-28 16:22:25 +01:00
Phillip Thelen
601811eac6
fix lint error
2019-02-28 15:30:33 +01:00
Phillip Thelen
071dffe8f2
Add check to make sure users don’t search for parties/guilds they are not part of
2019-02-28 15:27:58 +01:00
Matteo Pagliazzi
45a9d6d17b
ios: cancel invalid subscriptions without errors ( #11035 )
2019-02-27 18:48:13 +01:00
Matteo Pagliazzi
cc766d2260
gcp stackdriver tracing: attach user id ( #11033 )
2019-02-27 18:47:33 +01:00
Sabe Jones
ccb088e127
Merge branch 'sabrecat/email-split' into release
2019-02-26 17:52:48 -06:00
Sabe Jones
4a4d48aed8
chore(email): expand to 4 variants
2019-02-26 10:14:55 -06:00
Sabe Jones
fe04b56ecc
feat(content): February Mystery Items
2019-02-25 16:58:56 -06:00
Sabe Jones
901d11c61f
fix(logging): move Stackdriver init higher up ( #11025 )
2019-02-24 14:05:59 +01:00
Matteo Pagliazzi
78b49b9c7e
gcp: add stackdriver tracing ( #11024 )
2019-02-23 18:20:09 +01:00
Sabe Jones
ea5ce64db6
fix(email): use updated slugs
...
and genericize logic for easier tweaking later
2019-02-22 15:47:24 -06:00
Sabe Jones
10b69986c0
chore(email): split test for welcome message
2019-02-22 15:13:32 -06:00
Chester Sng
d267f09d04
Enable Username to be searched in Hall of Heroes - fixes #10972 ( #10980 )
...
* Add if block to search for username if not valid uuid
* Add validationError check
* Modify test case and added test case for username
* Update description of API
* Update Test
* Correct test
* Change placeholder text in heroes.vue
* Refactor code
* Add quotes
* Update hall.js
2019-02-21 13:33:15 -06:00
Sabe Jones
b21cd4a2b6
feat(content): Mythical Marvels Bundle
...
and end Valentine's miscellany
2019-02-19 18:06:21 -06:00
Phillip Thelen
1173a9b586
Correctly handle autocomplete for public and private guilds
2019-02-15 15:56:18 +01:00
Sabe Jones
ca2f2ba9ce
Merge branch 'develop' into release
2019-02-14 13:39:52 -06:00
Sabe Jones
165ca8737b
chore(news): Blog Bailey
2019-02-14 13:25:40 -06:00
Phillip Thelen
076e1b851e
Merge branch 'develop' into phillip/autocomplete-username
2019-02-14 18:02:19 +01:00
Phillip Thelen
718ea926d8
add optional parameters to limit autocompletion to specific group
2019-02-14 17:59:51 +01:00
Sabe Jones
f137342d88
fix(analytics): still more registeredThrough cleanup
2019-02-12 16:12:53 -06:00
Sabe Jones
94db493974
fix(analytics): don't also send prop along with event
2019-02-12 16:07:14 -06:00
Sabe Jones
ee5c761680
fix(analytics): set reg platform only once
2019-02-12 16:04:14 -06:00
Sabe Jones
b711c1672b
fix(lint): use curly apostrophe and single quotes
2019-02-12 13:48:53 -06:00
Sabe Jones
d675e80555
fix(lint): use curly apostrophe and single quotes
2019-02-12 13:48:13 -06:00
Phillip Thelen
328ecb22d8
Fix lint error
2019-02-12 15:36:49 +01:00
Phillip Thelen
be5137d14d
Merge branch 'develop' into phillip/autocomplete-username
2019-02-12 14:40:47 +01:00
Phillip Thelen
3fec6fca0e
optimize autocomplete regex
2019-02-12 14:38:45 +01:00
Sabe Jones
2c1ca7629d
Merge branch 'release' into develop
2019-02-12 07:35:56 -06:00
Phillip Thelen
bb674d1539
Cache username autocomplete requests
2019-02-12 14:31:30 +01:00
Sabe Jones
b721155f01
feat(event): Valentine's 2019 and Magic Hatching Potions
2019-02-12 07:19:58 -06:00
Phillip Thelen
59dbd12576
Fix sending private messages
2019-02-08 17:40:27 +01:00
negue
0cbd6fb4d7
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/header/menu.vue
2019-02-07 19:16:10 +01:00
Matteo Pagliazzi
b35bd18282
Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix
2019-02-07 18:20:05 +01:00
Phillip Thelen
e9d5123f8a
fix failing tests
2019-02-07 18:02:23 +01:00
Phillip Thelen
82863bd947
optimize mention highlighting
2019-02-06 15:00:41 +01:00
Sabe Jones
93290ec6d5
Merge branch 'release' into develop
2019-02-05 15:44:40 -06:00
Sabe Jones
6ab3bac96c
feat(content): Armoire and BGs
2019-02-05 15:42:33 -06:00
Phillip Thelen
8618913a75
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
...
# Conflicts:
# package.json
2019-02-05 16:48:06 +01:00
Sabe Jones
f590c485dc
Merge branch 'release' into develop
2019-02-04 16:52:53 -06:00
Sabe Jones
0910f65fc0
chore(news): Bailey
2019-02-04 16:52:17 -06:00
Sabe Jones
dddd8269b6
Merge branch 'release' into develop
2019-02-02 13:04:35 -06:00
Sabe Jones
5b329db357
chore(event): end Winter Wonderland
2019-02-02 13:03:04 -06:00
Sabe Jones
c1cad5c0a9
Merge branch 'release' into develop
2019-01-31 17:12:21 -06:00
Sabe Jones
b1f42dcac9
feat(content): Habitica Birthday 2019
2019-01-31 17:10:56 -06:00
Sabe Jones
c86da9783b
Merge branch 'release' into develop
2019-01-30 09:06:42 -06:00
Sabe Jones
00a686dcf6
feat(content): subscriber items Jan 2019
2019-01-28 16:10:22 -06:00
negue
2f699e24d7
update test to use the correct author_name format
2019-01-27 19:05:00 +01:00
negue
faa0611ab2
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
2019-01-27 18:14:51 +01:00
Giacomo Lawrance
08c8f26b80
Merge branch 'develop' into 10954-wikiafix
2019-01-26 18:03:50 +00:00
Mira-M
87923b7f0d
Add username to challenge csv export ( #10956 )
...
- Adds the member's username to the challenge csv
- Updates to unit tests
- Issue #10955
Supports the ability for challenge owners to judge challenge winners
after the added functionality enabling users to modify their name
(display name). The added field ties the user to their results by
their username.
2019-01-26 18:44:48 +01:00
Sabe Jones
5fac4a943c
chore(news): Bailey
2019-01-24 13:35:32 -06:00
Sabe Jones
5d0be7bc72
Merge branch 'release' into develop
2019-01-24 13:14:19 -06:00
Giacomo Lawrance
9e6394c38c
changed wikia links to fandom
...
Fixes issue #10954
2019-01-24 11:21:52 +00:00
Matteo Pagliazzi
6ea4d96830
add extra condition to skip ssl check
2019-01-23 17:19:57 +01:00
Matteo Pagliazzi
04a7fd25a6
allow skipping SSL check with secret key ( #10962 )
2019-01-23 17:10:11 +01:00
Sabe Jones
f8d799d55c
chore(news): Bailey
2019-01-18 15:13:25 -06:00
Sabe Jones
5bd9fcc99d
Merge branch 'release' into develop
2019-01-18 14:59:37 -06:00
Matteo Pagliazzi
40060e8ff5
update ssl check
2019-01-18 11:43:02 +01:00
Sabe Jones
ec37524164
chore(promo): end G1G1 deal
2019-01-15 18:57:10 -06:00
Sabe Jones
962662fe7c
chore(news): Bailey
2019-01-14 12:38:35 -06:00
Matteo Pagliazzi
f63d2e47f0
do not show "Notification not found" error messages ( #10931 )
...
* start fixing #10391
* do not show snackbars for notifications not found
* revert message changes
* update tests
* add new test
* fix property
2019-01-13 11:43:02 +01:00
Sabe Jones
8237b7f2de
chore(news): Bailey
2019-01-11 13:37:58 -06:00
Sabe Jones
1d1b25391f
feat(content): customizations and dinosaurs
2019-01-08 19:30:41 -06:00
negue
61606cb69d
change to User ID - change mail var _DISPLAYNAME _DISPLAY_NAME
2019-01-04 21:04:41 +01:00
Sabe Jones
d22b4bb2f7
feat(content): Armoire and Backgrounds Jan 2019
2019-01-04 13:58:51 -06:00
Juliusdotsh
1e10e20a24
apidocs should say how to provide comment when flagging #10916 ( #10925 )
2019-01-03 11:31:03 +01:00
Sabe Jones
b1aeb8ed87
Merge branch 'release' into develop
2019-01-02 17:08:50 -06:00
Sabe Jones
af40c437be
chore(news): Bailey
...
also fix erroneously active hatching potion and remove concluded bundle
from pinned items
2019-01-02 16:10:57 -06:00
Sabe Jones
a99150c485
Merge branch 'release' into develop
2019-01-01 07:14:04 -06:00
Sabe Jones
696b67204d
fix(lint): ’
2019-01-01 07:13:41 -06:00
Sabe Jones
4f3536e887
Merge branch 'release' into develop
2018-12-31 23:48:59 +00:00
Sabe Jones
f7983f39eb
feat(event): New Year's 2018-19
2018-12-31 17:44:13 -06:00
Rene Cordier
7c954f7073
Prevent progress being cleared when quest ends ( #10870 )
...
* Prevent progress being cleared when quest ends
changing group tests to make sure it keeps user's progress
fix and remove .only() from tests
* fix tests and check null case for clearing up user's quest without resetting progress
2018-12-28 19:16:21 +01:00
negue
19b75c6257
drag tags to reorder ( #10911 )
...
* drag tags to reorder
* change color, remove unneeded sortTag-call
2018-12-23 19:45:05 +01:00
Phillip Thelen
cfbfec34aa
Allow gems and subs to be gifted through in-app-purchases ( #10892 )
...
* Allow gems to be gifted through IAPs
* implement non recurring IAP subscriptions
* fix localization issue in error
* fix non renewing subscription handling
* Fix lint error
* fix tests
* move findbyId mock to helper file
* undo package-lock changes
* Fix lint error
2018-12-23 19:20:14 +01:00
Sabe Jones
1d68cbfaa2
chore(news): more Bailey
2018-12-21 14:42:11 -06:00
Sabe Jones
a6cea47789
feat(event): Winter Wonderland 2018
2018-12-20 11:11:50 -06:00
Sabe Jones
8220199e49
Gift 1 Get 1 Promo 2018-19! ( #10915 )
...
* feat(subscription): promo banner in modal
* feat(subscription): promo banner on main page
* fix(banners): remove extraneous margin adjustment
* fix(banners): various
* feat(promotion): gift 1, get 1
* fix(promo): various
* chore(promo): add Bailey
* fix(promo): use different email template for promo beneficiary
* fix(promo): turns out Winter is meaningful
2018-12-18 15:28:53 -06:00
Sabe Jones
d5955b8889
Merge branch 'develop' into release
2018-12-14 15:15:06 -06:00
Sabe Jones
979497dd35
fix(deletion): user delete bugs
...
Correct lookup in GDPR script, and address a TypeError when deleting a user with no tasks
2018-12-14 00:54:59 +00:00
Sabe Jones
8750701c08
Merge branch 'release' into develop
2018-12-11 20:45:44 +00:00
Sabe Jones
1b12a6b51f
feat(content): Bird Buddies Bundle
2018-12-11 14:41:09 -06:00
Matteo Pagliazzi
8441b0a3d6
fix http auth env var
2018-12-09 20:12:50 +01:00
negue
1c17b415f0
refactor {group,inbox}-chatReporter variables
2018-12-06 23:55:18 +01:00
Sabe Jones
f42e22b58f
Make env vars more palatable for containerization ( #10895 )
...
* refactor(env-vars): remove object/colon syntax
* fix(tests): correct config expectations
2018-12-06 10:13:49 -06:00
Sabe Jones
18ab57eb91
Merge branch 'release' into develop
2018-12-05 20:44:02 +00:00
Sabe Jones
5cd62d7052
feat(content): Armoire and BGs 2018-12
2018-12-05 14:38:53 -06:00
Matteo Pagliazzi
b66a0b76ef
Merge pull request #10886 from jeongjinhwi/develop
...
Accoount Deletion Feedback:update email #10880
2018-12-04 09:38:33 +01:00
Sabe Jones
bb01475e02
Merge branch 'release' into develop
2018-12-03 22:54:08 +00:00
Sabe Jones
3ba5ea1d2d
chore(news): Bailey
2018-12-03 16:50:02 -06:00
Sabe Jones
aaa16a9527
refactor(migrations): move Take This to new template
...
also fix linting error in server lib
2018-12-03 22:04:52 +00:00
Jeong Jin Hwi
53ca9475ee
Accoount Deletion Feedback:update email #10880
2018-12-03 01:04:42 +09:00
Matteo Pagliazzi
d2f7cba43d
Merge branch 'develop' into payments/paypal-amazon-checkout
2018-12-02 14:47:56 +01:00
Matteo Pagliazzi
7873800f87
fix(kafka queue): remove leftover code
2018-12-01 12:16:34 +01:00
Sabe Jones
de0c62a37f
Merge branch 'release' into develop
2018-11-30 20:28:23 +00:00
Sabe Jones
b91ef9f539
chore(news): Last Chance Bailey
...
also give a few more days for items
2018-11-30 14:21:12 -06:00
Matteo Pagliazzi
ac0601630e
Merge branch 'develop' into payments/paypal-amazon-checkout
2018-11-30 16:11:55 +01:00
Matteo Pagliazzi
3239491144
fix(lint): remove unused params
2018-11-30 16:04:56 +01:00
negue
b912a83f22
refactor "formatUser" to show the correct user and displayname
2018-11-29 20:15:47 +01:00
negue
fb3a9740bd
add display name to the email variables
2018-11-29 20:00:05 +01:00
negue
817c943860
Merge remote-tracking branch 'origin/develop' into negue/flagpm
2018-11-29 19:02:01 +01:00
negue
0aba448c48
fix sentence
2018-11-29 19:01:26 +01:00
Sabe Jones
b218eb2c00
Merge remote-tracking branch 'origin/greenkeeper/update-to-node-10' into release
...
also remove Kafka
2018-11-29 14:51:40 +00:00
Matteo Pagliazzi
7f2e12ba23
remove memwatch-next, try/catch
2018-11-29 14:35:22 +01:00
Sabe Jones
357b48dc8f
fix(server): update package lock, attempt to log crashes
2018-11-29 12:11:03 +00:00
Matteo Pagliazzi
2cbd78b139
Merge branch 'develop' into payments/paypal-amazon-checkout
2018-11-29 10:55:13 +01:00
Sabe Jones
b82660823d
Merge branch 'release' into develop
2018-11-28 20:57:37 +00:00
Sabe Jones
f19e69948a
feat(content): mystery items 2018-11
2018-11-28 14:50:43 -06:00
Sabe Jones
e6807d36b5
fix(analytics): record usernames
2018-11-28 13:02:48 -06:00
Phillip Thelen
1ece230621
remove console call
2018-11-28 12:52:08 -06:00
Phillip Thelen
d934d9d759
Move group chat analytics event to server
2018-11-28 12:52:00 -06:00
Phillip Thelen
8641a98107
Merge branch 'develop' into phillip/autocomplete-username
2018-11-28 14:02:35 +01:00
Matteo Pagliazzi
bf7fabb20a
fix(amazon): add new env variable to specify environment
2018-11-28 11:07:06 +01:00
Phillip Thelen
664a457b47
Merge branch 'develop' into phillip/autocomplete-username
2018-11-27 15:47:00 +01:00
Sabe Jones
8c1208031d
chore(event): end Thanksgiving tweaks
2018-11-27 15:42:28 +01:00
Phillip Thelen
aac23f30cf
Attach client to chat messages ( #10845 )
...
* Attach client to chat messages
* Word
* Design tweaks
* Fix potential error
2018-11-27 15:42:28 +01:00
Sabe Jones
916d930a83
feat(content): Turkey Day 2018
2018-11-27 15:41:42 +01:00
Alys
21f14d55b7
add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2018-11-27 15:41:42 +01:00
Sabe Jones
d661c7260e
feat(content): Frost Hatching Potions
2018-11-27 15:41:41 +01:00
Matteo Pagliazzi
1ccb700b3f
Fix for #10814 , prevent ParallelSave errors ( #10852 )
...
* fix(group leave): prevent ParallelSave errors while leaving a group with multiple group or challenge tasks
* fix typo
2018-11-27 15:41:41 +01:00
Nathanael Farley
f5a2cf6726
groupChatReceived webhook fix ( #10802 )
...
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.
* Added test for new functionality.
2018-11-27 15:40:41 +01:00
Sabe Jones
62bcd878a0
feat(content): Oddballs Bundle
...
Also includes one more tweak to @mention text highlighting
2018-11-27 15:40:40 +01:00
Sabe Jones
e548074bc1
chore(news): Bailey
2018-11-27 15:40:40 +01:00
Phillip Thelen
f65240c217
Fix issue with username highlighting
2018-11-27 13:20:45 +01:00
Phillip Thelen
0271d98b91
Add Test to opt out of username being searchable
2018-11-27 13:20:26 +01:00
Sabe Jones
7b687280d7
Merge branch 'release' into develop
2018-11-26 19:10:05 +00:00
Sabe Jones
33e0892e95
chore(event): end Thanksgiving tweaks
2018-11-26 12:59:23 -06:00
Phillip Thelen
e9c86622c5
Begin adding server-side autocomplete to web client
2018-11-26 15:47:22 +01:00
Phillip Thelen
42b146d5d0
Attach client to chat messages ( #10845 )
...
* Attach client to chat messages
* Word
* Design tweaks
* Fix potential error
2018-11-26 10:45:42 +01:00
Sabe Jones
2cd66436bc
Merge branch 'release' into develop
2018-11-22 18:05:28 -06:00
Sabe Jones
9cea86f4e0
feat(content): Turkey Day 2018
2018-11-22 15:05:03 -06:00
Matteo Pagliazzi
680c2162a7
paypal: new redirects
2018-11-21 11:19:55 +01:00
Alys
a2b38ffb02
add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2018-11-21 19:48:50 +10:00
Sabe Jones
9562ba432f
Merge branch 'release' into develop
2018-11-20 21:02:17 +00:00
Sabe Jones
37ae467fff
feat(content): Frost Hatching Potions
2018-11-20 14:55:45 -06:00
negue
52a7112591
some ui fixes / requested changes
2018-11-20 17:20:58 +01:00
negue
3203bffeaa
refactor update the message to use .save - fix test
2018-11-18 22:37:09 +01:00
negue
8b15d94ae1
Merge remote-tracking branch 'origin/develop' into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/chat/chatMessages.vue
# website/common/locales/en/messages.json
2018-11-18 22:04:33 +01:00
Matteo Pagliazzi
e76bdbd62d
Fix for #10814 , prevent ParallelSave errors ( #10852 )
...
* fix(group leave): prevent ParallelSave errors while leaving a group with multiple group or challenge tasks
* fix typo
2018-11-18 20:48:16 +01:00
Nathanael Farley
ff81e55839
groupChatReceived webhook fix ( #10802 )
...
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.
* Added test for new functionality.
2018-11-17 10:48:41 +01:00
Sabe Jones
c2fe04367f
feat(content): Oddballs Bundle
...
Also includes one more tweak to @mention text highlighting
2018-11-15 15:58:07 -06:00
Phillip Thelen
aae2fb1cb9
Create links to users profile in chat messages
2018-11-15 14:27:14 +01:00
Phillip Thelen
39761bdc04
Add API Call to retrieve auto-complete options for usernames
2018-11-15 12:01:26 +01:00
Sabe Jones
d406da4081
chore(news): Bailey
2018-11-14 08:30:34 -06:00
Sabe Jones
d74786ef85
Merge branch 'sabrecat/usernames-master' into develop
2018-11-14 08:21:49 -06:00
Matteo Pagliazzi
7d29ae44ba
move the update username route to v3 ( #10836 )
2018-11-14 13:32:21 +01:00
Matteo Pagliazzi
1a7461a8a2
move the update username route to v3 ( #10836 )
2018-11-14 10:40:27 +01:00
SabreCat
239f78674b
fix(usernames): address failing tests
2018-11-14 01:44:09 +00:00
Sabe Jones
d691dee2ca
fix(usernames): filter @ on server side for username lookup
2018-11-13 15:34:50 -06:00
Sabe Jones
481bd6727d
fix(usernames): exclude unverified users during query
2018-11-13 15:13:41 -06:00
Sabe Jones
34e7690c38
fix(usernames): various
...
Disappearing input fields
Text replacement in @mentions
UUID visibility in profiles
Purple dot for @mentioned usernames
TypeError preventing RYA
Group Plan member list error
2018-11-13 14:14:02 -06:00
Sabe Jones
7484ecf729
Merge branch 'develop' into sabrecat/usernames-master
2018-11-08 15:13:28 -06:00
negue
8f2435c37c
refactor Inbox-mongodb requests
2018-11-08 22:04:55 +01:00
Sabe Jones
2789d44dbf
chore(news): Bailey
2018-11-08 12:43:50 -06:00
Sabe Jones
5d6b6ed29a
feat(usernames): follow-up email and setting for email opt-out
2018-11-08 10:00:25 -06:00
Sabe Jones
b1dd79f75c
fix(invites): bogus validation errors
2018-11-07 15:58:17 -06:00
Sabe Jones
1ac4dd8171
feat(usernames): invite by username
2018-11-07 15:00:22 -06:00
Sabe Jones
4f86abd6b2
Merge branch 'develop' into sabrecat/usernames-master
2018-11-07 08:39:57 -06:00
Sabe Jones
38efe83cc7
fix(usernames): various
...
Partial fixage for autocomplete @ing
Don't add username to chat message if user is unverified
Fix flying pets
Fix console error about avatar intro
2018-11-06 19:55:06 -06:00
Sabe Jones
2dadd74097
Merge branch 'release' into develop
2018-11-06 16:53:35 -06:00
Sabe Jones
ccc3b4d337
feat(content): Armoire and Backgrounds 2018/11
2018-11-06 14:31:50 -06:00
Sabe Jones
a5ef6a129e
fix(auth): new users should start verified
2018-11-03 16:03:53 -05:00
Sabe Jones
43194b71ce
fix(usernames): RYA positioning and contrib tier in PMs
2018-11-03 12:50:59 -05:00
Sabe Jones
112e4e1d76
Merge branch 'develop' into sabrecat/usernames-master
2018-11-01 21:51:33 -05:00
Sabe Jones
830c8d3104
chore(event): end Habitoween/Fall Fest
...
Also announce November challenges
2018-11-01 21:44:00 -05:00
Sabe Jones
3922415314
fix(inbox): more UN display fixes
2018-11-01 17:41:27 -05:00
Sabe Jones
6ab08a7d52
fix(usernames): don't supply username in public fields if unverified
2018-11-01 15:32:40 -05:00