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

..

user

Feature/sortable reward area (#9930)

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

challenge.js

Node 8 (WIP) (#9946)

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

chat.js

Move Chat to Model (#9703)

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

coupon.js

models: add required: true to id fields where missing

2016-12-18 17:16:49 +01:00

emailUnsubscription.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

group.js

Merge branch 'develop' into party-chat-translations

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

iapPurchaseReceipt.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

pushDevice.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

subscriptionPlan.js

Support subscription payment through Google Play Store (#8437)

2017-02-01 18:39:37 -06:00

tag.js

Client Tasks v3 (#8926)

2017-08-09 17:13:40 +02:00

task.js

round priority on update too (#10186)

2018-04-14 16:16:25 +02:00

userNotification.js

notifications: fix tests

2018-02-04 14:04:41 +01:00

webhook.js

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

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