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

# Conflicts:
#	website/client/store/actions/chat.js

2018-06-25 18:47:47 +02:00

..

tasks

do not load inbox in tasks routes (#10302)

2018-05-04 16:00:57 -05:00

user

moving developer-only strings to api/common messages (#10258)

2018-05-04 16:00:19 -05:00

auth.js

only store necessary data for social login (continuation of 10352) (#10395)

2018-05-25 18:16:30 +02:00

challenges.js

Remove parallel calls to save (#10416)

2018-06-01 15:56:01 +02:00

chat.js

fix ci - revert reporter to user var

2018-06-13 22:55:28 +02:00

content.js

Node 8 (WIP) (#9946)

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

coupon.js

moving developer-only strings to api/common messages (#10258)

2018-05-04 16:00:19 -05: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

Fix documentation about rejecting group invitation (#10466)

2018-06-23 11:24:33 +02:00

hall.js

moving developer-only strings to api/common messages (#10258)

2018-05-04 16:00:19 -05:00

i18n.js

Upgrade tests tools and lint migrations and scripts (part 2) (#9998)

2018-02-17 18:11:24 +01:00

iap.js

Format files to adhere to editorconfig (#7977)

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

members.js

remove unneeded try/catch

2018-06-08 21:03:26 +02:00

modelsPaths.js

apiDoc: meta (#8167)

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

news.js

chore(news): Blog Bailey

2018-06-22 18:58:47 +00:00

notifications.js

start removing inbox from some routes (#10259)

2018-04-16 18:43:09 +02:00

pushNotifications.js

start removing inbox from some routes (#10259)

2018-04-16 18:43:09 +02:00

quests.js

fix(emails): make sure quest invitations are sent to users that signed up with google, fixes #10389 (#10393)

2018-05-25 12:13:02 +02:00

shops.js

start removing inbox from some routes (#10259)

2018-04-16 18:43:09 +02:00

status.js

Api doc status (#8165)

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

tags.js

start removing inbox from some routes (#10259)

2018-04-16 18:43:09 +02:00

tasks.js

Habits: store one history entry per day (#10442)

2018-06-21 21:25:19 +02:00

user.js

fix(i18n): pass path to wrongItemPath string, fixes #10403

2018-05-28 13:40:49 +02:00

webhook.js

Webhooks v2 (and other fixes) (#10265)

2018-04-29 20:07:14 +02:00

world.js

feat(event): Spring Fling 2018

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