Victor Piousbox 4c0f9ed1c8 resolving conflicts

2016-04-07 21:23:16 +00:00

..

addWebhook.test.js

shared-code-webhooks

2016-04-04 16:31:48 +00:00

allocate.js

fix(test): make sure error is catched using done() callback

2016-03-30 23:32:12 +02:00

allocateNow.js

port allocateNow and autoAllocate

2016-03-20 20:21:15 +01:00

buy.js

Merge branch 'develop' into api-v3

2016-03-30 23:40:00 +02:00

buyMysterySet.js

fix(test): make sure error is catched using done() callback

2016-03-30 23:32:12 +02:00

buyQuest.js

fix(test): make sure error is catched using done() callback

2016-03-30 23:32:12 +02:00

buySpecialSpell.js

fix(test): make sure error is catched using done() callback

2016-03-30 23:32:12 +02:00

changeClass.js

fix(test): make sure error is catched using done() callback

2016-03-30 23:32:12 +02:00

deleteWebhook.test.js

shared-code-webhooks

2016-04-04 16:31:48 +00:00

disableClasses.js

port disable classes and change class ops

2016-03-24 14:25:30 +01:00

equip.js

v3: port hatch, equip and feed ops

2016-03-24 18:59:09 +01:00

feed.js

fix(test): make sure error is catched using done() callback

2016-03-30 23:32:12 +02:00

hatch.js

fix(test): make sure error is catched using done() callback

2016-03-30 23:32:12 +02:00

hourglassPurchase.js

Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests

2016-04-01 08:11:26 -05:00

openMysteryItem.js

Ported open mystery item, added unit tests, added route, and integration tests

2016-04-01 08:23:40 -05:00

purchase.js

Ported purchase, add unit tests, created new user purchase route, and added tests

2016-04-01 08:14:15 -05:00

readCard.js

Ported read card, added unit tests, added read card route and integration tests

2016-04-01 09:17:40 -05:00

releaseBoth.js

Ported release both, added unit tests, add release both route with integration tests

2016-04-03 14:44:00 -05:00

releaseMounts.js

Ported release mounts, add unit tests, added release mounts route with integration tests

2016-04-03 14:34:43 -05:00

releasePets.js

Ported release pets, added unit tests, added route with integration tests

2016-04-03 14:37:20 -05:00

scoreTask.test.js

shared-code-user-score-task

2016-04-01 16:11:37 +00:00

sleep.js

change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it

2016-03-15 17:05:07 +01:00

updateWebhook.test.js

shared-code-webhooks

2016-04-04 16:31:48 +00:00