Commit Graph

350 Commits

Author SHA1 Message Date
Alys
fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10:00
Matteo Pagliazzi
468a312357 v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203) 2016-05-13 19:08:38 +02:00
Matteo Pagliazzi
199732539f chore(): rename website/src -> website/server and website/public -> website/client (#7199) 2016-05-13 15:35:12 +02:00
Matteo Pagliazzi
93336f3894 v3: misc fixes 2016-05-12 18:06:26 +02:00
Matteo Pagliazzi
a8f4731a0a Merge pull request #7091 from HabitRPG/api-v3-client
[API v3] Client
2016-05-11 16:36:22 +02:00
Matteo Pagliazzi
8276ffcfe2 v3: fix tests 2016-05-11 16:21:22 +02:00
Matteo Pagliazzi
998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00
Matteo Pagliazzi
95aff08de3 v3 fix tests and use coroutines instead of regenerator 2016-05-11 15:59:18 +02:00
Matteo Pagliazzi
cee7700a50 switch from Q to Bluebird 2016-05-11 14:34:01 +02:00
Keith Holliday
632a1ebbf3 Fixed linting and some tests 2016-05-10 15:15:55 -05:00
Keith Holliday
a92359e119 Moved markPMSRead to common.ops. Added tests 2016-05-10 15:15:55 -05:00
Matteo Pagliazzi
b3a78fba97 v3 payments: fix tests 2016-05-10 18:14:28 +02:00
Matteo Pagliazzi
1c887b18e1 v3 payments: fix urls in tests 2016-05-10 17:00:47 +02:00
Matteo Pagliazzi
e980b3ce0a Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-08 19:19:20 +02:00
Matteo Pagliazzi
21d798bca7 v3: GET /groups accept a guilds type which returns all the guilds the user is a member of 2016-05-03 15:49:47 +02:00
Matteo Pagliazzi
72f4bd0aab Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-02 00:26:02 +02:00
Matteo Pagliazzi
8391494b89 v3: fix tags tests 2016-05-01 14:15:26 +02:00
Matteo Pagliazzi
79c8449e1e Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 19:28:45 +02:00
Matteo Pagliazzi
6380161321 Api v3 Migration (WIP) (#7131)
* v3 migration: remove old code and polish user migration

* v3 migration: start to work on challenges

* wip v3 migration

* wip v3 migration: fix _id -> id for reminders, tags and checklists
2016-04-30 18:34:16 +02:00
Matteo Pagliazzi
0c38caa2f9 Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 16:51:51 +02:00
Victor Pudeyev
a567476bb7 V3 payments 7 stripe (#7124)
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.

* basic controller for stripe payments

* authWithUrl is in

* stripe cleanup

* making tests pass

* stripe bug fixes

* 400 error is right

* cleanup of sinon spy for fakeSend

* paypal payments

* lint of paypal

* require -> import
2016-04-30 16:42:10 +02:00
Victor Pudeyev
fa21577c46 V3 payments 6 (#7104)
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.
2016-04-27 21:26:32 +02:00
Matteo Pagliazzi
d6ea0a3b40 v3: fix setting challenge.official 2016-04-25 14:34:59 +02:00
Matteo Pagliazzi
c5aa15cf47 v3: fix ability to join public guild you were already a member of 2016-04-23 03:08:03 +02:00
Victor Piousbox
54a94db2de working on amazon payments 2016-04-21 03:52:29 +00:00
Matteo Pagliazzi
6568fcfd5e res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests 2016-04-21 00:52:03 +02:00
Victor Piousbox
3cba6d934b resolving conflicts 2016-04-20 22:04:31 +00:00
Keith Holliday
9e3d8ba4ac Separated out buy functions into buyGear, buyArmoire, and buyPotion (#7065) 2016-04-19 16:50:04 +02:00
Matteo Pagliazzi
b271520c53 v3: general cleanup 2016-04-17 01:17:22 +02:00
Victor Piousbox
261a5a66b1 working on promisifying amazonPayments 2016-04-15 16:46:50 +00:00
Blade Barringer
33c0cdd569 chore(lint): lint files in preparation for eslint v2 2016-04-15 08:37:05 -05:00
Matteo Pagliazzi
11b5c1b405 v3: several fixes to class system, move /logout outside of api 2016-04-14 20:05:30 +02:00
Matteo Pagliazzi
57497f246f make tests working with new tavern id 2016-04-13 22:27:32 +02:00
Matteo Pagliazzi
6458796a36 v3: first review of common code and task models 2016-04-12 19:30:39 +02:00
Keith Holliday
3970064fe5 Ported reset. Added unit tests. Added reset route. Added integration tests 2016-04-12 11:19:36 -05:00
Keith Holliday
42ef779b46 Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests 2016-04-10 09:47:14 -05:00
Victor Piousbox
1f4a0680ea shared-code-private-messages 2016-04-09 16:56:03 +00:00
Matteo Pagliazzi
910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Keith Holliday
1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00
Matteo Pagliazzi
70fd869934 Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-08 12:03:50 +02:00
Victor Piousbox
9704c47293 Merge branch 'api-v3' into shared-code-webhooks 2016-04-07 21:23:38 +00:00
Victor Piousbox
4c0f9ed1c8 resolving conflicts 2016-04-07 21:23:16 +00:00
Keith Holliday
fec9ce3dbe Ported rebirth. Add unit tests. Added rebirth route. Added integration tests 2016-04-07 15:02:55 -05:00
Matteo Pagliazzi
81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive 2016-04-06 23:24:14 +02:00
Keith Holliday
621bf9609e Ported revive. Added unit tests. Add revive route. Added integration tests 2016-04-06 15:59:42 -05:00
Keith Holliday
2bd710a882 Ported unlock. Add unit tests. Create unlock route. Add integration tests 2016-04-06 15:53:32 -05:00
Keith Holliday
05b41bb41c Ported sell function. Add unit tests. Create sell route. Add integration tests 2016-04-06 08:27:18 -05:00
Matteo Pagliazzi
0a40c56973 api v3 adapt v2: correctly import dependencies, port create, get, list groups 2016-04-04 23:18:49 +02:00
Victor Piousbox
14b0ec8b03 shared-code-webhooks 2016-04-04 16:31:48 +00:00
Matteo Pagliazzi
c3945de098 fix tasks updating and reminders tests 2016-04-04 17:18:42 +02:00