12 commits

Author	SHA1	Message	Date
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	95aff08de3	v3 fix tests and use coroutines instead of regenerator	2016-05-11 15:59:18 +02:00
Matteo Pagliazzi	0114e310eb	v3 payments: working IAP and Stripe, move paypalBillingSetup to its own file, closeChal is now a challenge instance method	2016-05-09 22:58:15 +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
Matteo Pagliazzi	f78bc2e6a8	v3 migration: barebone migration	2016-04-27 19:35:07 +02:00
Matteo Pagliazzi	c608d03e35	v3: start writing migrations	2016-04-23 15:00:55 +02:00
Victor Piousbox	f9915c3f77	recovering last weeks work on promisifying amazon payments	2016-04-21 00:07:58 +00:00
Matteo Pagliazzi	f44dbbbd71	Merge branch 'develop' into api-v3	2016-04-19 12:16:22 +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
Blade Barringer	887aa478ec	chore: merge in develop	2016-04-15 10:11:54 -05:00
Blade Barringer	10936d9a4d	chore: Switch to custom eslint-config	2016-04-15 09:03:59 -05:00