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
998c679e96
Merge branch 'api-v3' into api-v3-client
2016-05-11 16:01:54 +02:00
Matteo Pagliazzi
a947afa5c6
Merge branch 'develop' into api-v3
2016-05-11 14:36:58 +02:00
Matteo Pagliazzi
cee7700a50
switch from Q to Bluebird
2016-05-11 14:34:01 +02:00
Sabe Jones
7f11e766c3
Sabrecat/glasses chairs ( #7182 )
...
* feat(customization): new chairs, eyeglass sprites
* feat(avatar): finish glasses implementation
* fix(test): include glasses in base equipment
2016-05-10 16:07:46 -05:00
Keith Holliday
fd244ac021
Turned on client side tests. Fixed broken tests
2016-05-05 23:36:17 -05: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
Victor Piousbox
2bb36b5e04
things are broken with nconf
2016-04-15 16:46:50 +00:00
Victor Piousbox
261a5a66b1
working on promisifying amazonPayments
2016-04-15 16:46:50 +00: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
Matteo Pagliazzi
004b032084
adapt reset to v2 and remove deleted files from gulpfile
2016-04-12 18:50:02 +02:00
Keith Holliday
3970064fe5
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 11:19:36 -05:00
Matteo Pagliazzi
fa32dabc92
Merge pull request #7064 from piousbox/shared-code-crit
...
shared-code-crit
2016-04-12 09:58:46 +02:00
Victor Pudeyev
2f1329254e
shared-code-tags-gold-silver ( #7056 )
2016-04-12 09:57:57 +02:00
Blade Barringer
83850d7a0c
feat: build api doc after prod build
2016-04-11 17:34:44 -05:00
Victor Piousbox
2d69285080
shared-code-crit
2016-04-11 20:21:33 +00:00
Matteo Pagliazzi
36594b668a
fix(apidoc): apidoc now builds correctly
2016-04-11 18:05:54 +02:00
Keith Holliday
42ef779b46
Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests
2016-04-10 09:47:14 -05:00
Matteo Pagliazzi
7a24bceac9
Merge pull request #7051 from piousbox/shared-code-percent
...
shared-code-percent
2016-04-10 12:29:43 +02:00
Victor Piousbox
3c784e869a
shared-code-percent
2016-04-09 21:13:16 +00: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
Matteo Pagliazzi
276cbc58bb
v3: fix cron middleware, remove unused code from shared
2016-04-08 11:56:51 +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
2d3fbe9f13
v3 adapt v2: lint client only shared ops and enable members integration tests
2016-04-07 11:54:36 +02: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
Victor Piousbox
14b0ec8b03
shared-code-webhooks
2016-04-04 16:31:48 +00:00
Matteo Pagliazzi
382e391fd0
port updateTask, addTask, clearCompleted, taskDefaults, uuid
2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
58c20c2a64
v2 port: enable integration tests, port register route
2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
de74fae0b4
v3: port coupons
2016-04-02 16:37:55 +02:00
Victor Piousbox
7f3feedd12
shared-code-update-stats
2016-04-01 20:50:28 +00:00
Matteo Pagliazzi
aae94bf1b4
Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3
2016-04-01 16:39:52 +02:00
Matteo Pagliazzi
7e093f1622
Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2
2016-04-01 16:28:20 +02:00
Keith Holliday
3fe88fd8d0
Ported open mystery item, added unit tests, added route, and integration tests
2016-04-01 08:23:40 -05:00
Keith Holliday
ad0bc58028
Ported purchase, add unit tests, created new user purchase route, and added tests
2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166
Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests
2016-04-01 08:11:26 -05:00
Matteo Pagliazzi
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
Matteo Pagliazzi
3002c9b7fd
v3: port getBuyList and shared.updateStore
2016-03-26 16:25:15 +01:00
Keith Holliday
d7b6e0b760
Ported refPush and added tests
2016-03-25 08:33:55 -05:00
Matteo Pagliazzi
192409a0b5
Merge branch 'api-v3' into api-v3-equip-feed-hatch2
2016-03-25 12:22:55 +01:00
Matteo Pagliazzi
0a65e6a6f1
v3: port hatch, equip and feed ops
2016-03-24 18:59:09 +01:00
