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

# Conflicts:
#	website/server/controllers/api-v3/user.js

2018-02-26 19:55:32 +09:00

..

tasks

Merge branch 'develop' into party-chat-translations

2018-02-26 19:55:32 +09:00

user

Merge branch 'develop' into party-chat-translations

2018-02-26 19:55:32 +09:00

auth.js

Upgrade server deps (#10017)

2018-02-23 15:21:00 +01:00

challenges.js

Challenge small refactor (#9964)

2018-02-19 08:15:43 -07:00

chat.js

Save username instead of uuid (no queries necessary anymore)

2018-02-19 00:18:29 +09:00

content.js

Old Client Cleanup (#9141)

2017-10-12 16:44:28 +02:00

coupon.js

Documentation - coupon

2016-10-19 21:31:07 -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

Partial Fix for #8735 ("Failed party invitations do not indicate which invitations failed") (#9939)

2018-02-19 19:00:42 +01:00

hall.js

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

2018-02-17 18:11:24 +01: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

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

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

modelsPaths.js

apiDoc: meta (#8167)

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

news.js

feat(content): mystery items Feb 2018

2018-02-22 22:56:33 +00:00

notifications.js

notifications: fixes

2018-02-04 13:28:05 +01:00

pushNotifications.js

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

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

quests.js

Merge branch 'develop' into party-chat-translations

2018-02-26 19:55:32 +09:00

shops.js

[WIP] new client - seasonal-shop (#9018)

2017-09-20 19:28:11 -05:00

status.js

Api doc status (#8165)

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

tags.js

Notifications v2 and Bailey API (#9716)

2018-01-31 11:55:39 +01:00

tasks.js

task types: add new error messages for invalid task types (#9983)

2018-02-23 14:38:18 -06:00

user.js

Bulk spell casting (#10007)

2018-02-23 11:30:15 -07:00

webhook.js

Make responce codes uniform (#8865)

2017-07-17 14:28:25 -07:00

world.js

World Boss 2018 (Server) (#9995)

2018-02-13 19:21:39 -06:00