Commit Graph

1683 Commits

Author SHA1 Message Date
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
d33564e5d4 v3 payments: port paypal 2016-05-10 17:57:55 +02:00
Matteo Pagliazzi
1c887b18e1 v3 payments: fix urls in tests 2016-05-10 17:00:47 +02:00
Keith Holliday
9146e4601e Added tags service (#7176) 2016-05-10 16:27:36 +02:00
Matteo Pagliazzi
03008c0d40 Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-09 23:29:38 +02:00
Keith Holliday
20f9bbf449 Corrected reset checklist logic (#7154)
* Corrected reset checklist logic

* Change cron logic to reset rather than set

* Remove extra paranthesis
2016-05-09 23:06:27 +02:00
Matteo Pagliazzi
e980b3ce0a Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-08 19:19:20 +02:00
Keith Holliday
e747bba669 Updated add and remove tests for challenges (#7155) 2016-05-08 18:35:38 +02:00
Matteo Pagliazzi
34251ca7fc Merge branch 'api-v3-client-tests' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-client-tests2 2016-05-08 16:59:15 +02:00
Keith Holliday
4c37417bd4 Updated task service to use api v3 (#7136)
* Updated task service to use api v3

* Add user.ops functions back

* Removed extra parameter
2016-05-08 16:52:43 +02:00
Blade Barringer
7d41b76b2e Merge pull request #7148 from crookedneighbor/require-again
feat: Add require-again to help with unit testing
2016-05-06 12:20:19 -05:00
Blade Barringer
192488cb02 feat: Add require-again to help with unit testing 2016-05-06 12:05:06 -05:00
Keith Holliday
6556c2a670 Added missing done to tests. Fixed partyCtrl tests 2016-05-06 09:10:47 -05:00
Keith Holliday
fd244ac021 Turned on client side tests. Fixed broken tests 2016-05-05 23:36:17 -05:00
Keith Holliday
78a8eea79a Updated quest service to use new api-v3 (#7126)
* Updated quest service to use new api-v3

* Updated inviteToQuest function name. Used quest return rather than syncing party
2016-05-03 17:16:30 +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
01c07ae6df Merge branch 'api-v3' into api-v3-client 2016-05-02 00:25:25 +02:00
Matteo Pagliazzi
8391494b89 v3: fix tags tests 2016-05-01 14:15:26 +02:00
Matteo Pagliazzi
a63d5ae97f v3: fix tags tests 2016-05-01 13:25:19 +02:00
Matteo Pagliazzi
f5144fddaa v3 adapt v2: fix tags _id, stickyHeader and unlocking 2016-05-01 12:51:32 +02:00
Matteo Pagliazzi
79c8449e1e Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 19:28:45 +02:00
Matteo Pagliazzi
115c5374cb Merge branch 'api-v3' into api-v3-client 2016-04-30 19:28:16 +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
Matteo Pagliazzi
3437744f62 Merge branch 'api-v3' into api-v3-client 2016-04-30 16:51:15 +02:00
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +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
Keith Holliday
415418f30c Api v3 members port (#7109)
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Updated members service to use api v3

* Removed onlys

* Added invites to group detail

* Removed old user reject invite code
2016-04-30 10:54:25 +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
Keith Holliday
570d5c7fd9 Updated challenge service to user apiv3 and update challenge ctrl (#7111)
* Updated challenge service to user apiv3 and update challenge ctrl

* Removed extra code. Added challenge update. Fixed group qurey
2016-04-27 16:11:06 +02:00
Keith Holliday
2619b34c65 Updated chat service to use api v3 (#7113)
* Updated chat service to use api v3

* Removed , added back User functions, added todo
2016-04-27 15:59:10 +02:00
Blade Barringer
e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Keith Holliday
ea490c9a1f Ported groups service to user new api v3 and ported dependent controllers (#7108)
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
2016-04-25 23:11:23 +02:00
Matteo Pagliazzi
d6ea0a3b40 v3: fix setting challenge.official 2016-04-25 14:34:59 +02:00
Keith Holliday
050539d8f3 Added tests for cron (#7081)
* Added inital cron tests

* Added more subscribe tests and updated various tests for syntax and expectations
2016-04-24 00:54:50 +02:00
Matteo Pagliazzi
7dab7939cc v3: fix tavern during tests 2016-04-23 03:33:00 +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
Matteo Pagliazzi
6ba1afe479 Merge branch 'api-v3' into api-v3-unlock-fix 2016-04-22 12:33:39 +02:00
Victor Piousbox
cbf1a4c8d3 breaking changes promisifying amazon payments 2016-04-21 04:37:25 +00:00
Victor Piousbox
54a94db2de working on amazon payments 2016-04-21 03:52:29 +00:00
Victor Piousbox
612e3b725f little changes to lint 2016-04-21 00:25:43 +00:00
Victor Piousbox
f9915c3f77 recovering last weeks work on promisifying amazon payments 2016-04-21 00:07:58 +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
7aa6587f2f Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2 2016-04-19 12:07:18 +02:00
Matteo Pagliazzi
277248b8b7 switch to standard response format in v3 2016-04-18 21:56:58 +02:00