negue 92d68e5c6e Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm ...

# Conflicts:
#	website/client/components/chat/chatCard.vue
#	website/client/components/chat/chatMessages.vue
#	website/common/locales/en/messages.json
#	website/server/libs/slack.js

2018-09-22 19:18:08 +02:00

..

tasks

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

user

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

auth.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

challenges.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

chat.js

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2018-09-22 19:18:08 +02:00

content.js

Node 8 (WIP) (#9946)

2018-03-15 19:59:36 +01:00

coupon.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

cron.js

Added cron check

2017-06-08 17:10:22 -07:00

debug.js

Refactor api description with @apiParam groups to make it more explicit (#8919)

2017-08-15 18:06:19 -05:00

groups.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

hall.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

i18n.js

Localize time for due dates and chat messages (#10555)

2018-08-03 11:57:43 +02:00

iap.js

Format files to adhere to editorconfig (#7977)

2016-09-07 12:58:26 -05:00

inbox.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

members.js

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2018-09-22 19:18:08 +02:00

modelsPaths.js

apiDoc: meta (#8167)

2017-01-13 14:06:46 -07:00

news.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

notifications.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

pushNotifications.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

quests.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

shops.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

status.js

Api doc status (#8165)

2016-11-03 08:31:30 -05:00

tags.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

tasks.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

user.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

webhook.js

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

world.js

feat(event): Spring Fling 2018

2018-03-20 21:30:43 +00:00