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
..
user	Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username	2019-09-19 16:08:13 +02:00
challenge.js	Always send push notifications in recipients language (#11307)	2019-08-15 11:00:46 -04:00
coupon.js	WIP: Improve User model performances (#10832)	2019-04-01 19:24:18 +02:00
emailUnsubscription.js	Mongoose: use $type as the typeKey (#10789)	2018-10-28 15:42:48 -05:00
group.js	Always send push notifications in recipients language (#11307)	2019-08-15 11:00:46 -04:00
iapPurchaseReceipt.js	Mongoose: use $type as the typeKey (#10789)	2018-10-28 15:42:48 -05:00
message.js	add shadow-muting chat hiding feature (automatic flagging of public posts from shadow-muted players) - fixes 10851 (#11239)	2019-07-30 19:09:42 +02:00
pushDevice.js	Mongoose: use $type as the typeKey (#10789)	2018-10-28 15:42:48 -05:00
subscriptionPlan.js	Email subs reminders release (#11216)	2019-06-10 22:37:30 +02:00
tag.js	Mongoose: use $type as the typeKey (#10789)	2018-10-28 15:42:48 -05:00
task.js	Node 12 (#11149)	2019-08-19 22:43:17 +02:00
userNotification.js	feat(content): new pet color achievements	2019-09-17 16:10:32 -05:00
webhook.js	Mongoose: use $type as the typeKey (#10789)	2018-10-28 15:42:48 -05:00