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

..

tasks

Squashed commit of the following:

2019-08-02 15:49:41 -05:00

user

Move inbox to its own model (#10428)

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

auth.js

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

2019-09-19 16:08:13 +02:00

challenges.js

Minor fixes for apidocs and comments (#11249)

2019-07-09 16:18:41 +02:00

chat.js

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

2019-09-19 16:08:13 +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

WIP: Improve User model performances (#10832)

2019-04-01 19:24:18 +02:00

groups.js

Free group plan subscription from a party/guild no longer gets cancelled after leaving a guild - fixes #11055 (#11228)

2019-08-15 11:06:56 -04:00

hall.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

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

Inbox: Add API to list conversations (#11110)

2019-04-26 18:45:05 +02:00

members.js

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

2019-09-19 16:08:13 +02:00

modelsPaths.js

apiDoc: meta (#8167)

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

news.js

feat(content): new pet color achievements

2019-09-17 16:10:32 -05:00

notifications.js

do not show "Notification not found" error messages (#10931)

2019-01-13 11:43:02 +01:00

pushNotifications.js

Do not throw an error when adding the same push device twice (#10770)

2018-10-20 14:52:02 +02:00

quests.js

Always send push notifications in recipients language (#11307)

2019-08-15 11:00:46 -04: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

drag tags to reorder (#10911)

2018-12-23 19:45:05 +01:00

tasks.js

Squashed commit of the following:

2019-08-02 15:49:41 -05:00

user.js

Hourglass Quest (#11325)

2019-08-29 15:22:12 -04:00

webhook.js

api: Fix a few API documentation typos (#10749)

2018-10-13 20:03:40 +02:00

world.js

feat(event): Spring Fling 2018

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