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
..
items	fix(tests): Items Utils > castItemVal fix fn call	2019-04-26 00:02:53 +02:00
payments	Use mandrill for password resets and usernames in emails (#11277)	2019-07-22 19:44:01 +02:00
analyticsService.test.js	Amplitude fixes v2 (#11100)	2019-04-02 18:44:39 +02:00
apiError.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00
baseModel.test.js	Mongoose: use $type as the typeKey (#10789)	2018-10-28 15:42:48 -05:00
collectionManipulators.test.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00
cron.test.js	Fix cron test	2019-07-30 18:58:21 +02:00
email.test.js	Use mandrill for password resets and usernames in emails (#11277)	2019-07-22 19:44:01 +02:00
encryption.test.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00
errors.test.js	do not show "Notification not found" error messages (#10931)	2019-01-13 11:43:02 +01:00
highlightMentions.js	fix failing tests	2019-02-07 18:02:23 +01:00
i18n.test.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00
logger.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00
password.test.js	fix(tests): correct string update errors	2018-11-28 01:00:46 +00:00
preening.test.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00
pushNotifications.js	iOS push notifications, use node-apn (#10517)	2018-07-12 12:56:15 +02:00
setupNconf.test.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00
slack.js	update test to use the correct author_name format	2019-01-27 19:05:00 +01:00
taskManager.js	raise coverage for tasks api calls (#10029)	2018-10-01 13:29:14 +02:00
webhooks.test.js	API v4 (WIP) (#10453)	2018-06-18 14:40:25 +02:00