Mateus Etto 03b66abe70 Merge branch 'develop' into party-chat-translations ...

# Conflicts:
#	website/server/controllers/api-v3/quests.js
#	website/server/controllers/api-v3/tasks/groups.js
#	website/server/controllers/api-v3/user/spells.js
#	website/server/models/group.js

2018-04-25 21:15:49 +09:00

..

tasks

Merge branch 'develop' into party-chat-translations

2018-04-25 21:15:49 +09:00

user

Merge branch 'develop' into party-chat-translations

2018-04-25 21:15:49 +09:00

auth.js

Fix password reset when querying for emails with upcase characters (fixes #9059) (#9707)

2018-03-17 22:13:54 +01:00

challenges.js

Revert "moving developer-only strings to api messages (#10188)"

2018-04-15 17:09:15 +00:00

chat.js

Move Chat to Model (#9703)

2018-04-23 12:17:16 -05:00

content.js

Node 8 (WIP) (#9946)

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

coupon.js

Revert "moving developer-only strings to api messages (#10188)"

2018-04-15 17:09:15 +00: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 Chat to Model (#9703)

2018-04-23 12:17:16 -05:00

hall.js

start removing inbox from some routes (#10259)

2018-04-16 18:43:09 +02: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

Node 8 (WIP) (#9946)

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

modelsPaths.js

apiDoc: meta (#8167)

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

news.js

chore(news): Bailey

2018-04-19 19:25:45 +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

Merge branch 'develop' into party-chat-translations

2018-04-25 21:15:49 +09: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

add partial documentation for dueDate parameter in /api/v3/tasks/user and related code

2018-04-18 23:22:11 +10:00

user.js

Feature/sortable reward area (#9930)

2018-04-13 15:22:06 +02:00

webhook.js

start removing inbox from some routes (#10259)

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

world.js

feat(event): Spring Fling 2018

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