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 |
|
Matteo Pagliazzi
|
159b9eaa8d
|
port disable classes and change class ops
|
2016-03-24 14:25:30 +01:00 |
|
Blade Barringer
|
f33469609c
|
Adjust sprite task to not include wheelchair images in the customize-option handling
|
2016-03-24 07:57:50 -05:00 |
|
Matteo Pagliazzi
|
bd3c162b97
|
port allocateNow and autoAllocate
|
2016-03-20 20:21:15 +01:00 |
|
Matteo Pagliazzi
|
ff72706cae
|
wip(shared): port buy ops and linked fns
|
2016-03-19 16:04:27 +01:00 |
|
Matteo Pagliazzi
|
3db06c6537
|
Merge branch 'develop' into api-v3
|
2016-03-15 19:23:23 +01:00 |
|
Matteo Pagliazzi
|
219ec01ce9
|
port shared.ops.allocate
|
2016-03-15 18:41:23 +01:00 |
|
Matteo Pagliazzi
|
490c6a9ae1
|
wip(shared): port sleep op
|
2016-03-15 16:33:44 +01:00 |
|
Matteo Pagliazzi
|
f65a7321b7
|
fix common tests, explictly exclude tests from linting
|
2016-03-13 23:00:48 +01:00 |
|
Blade Barringer
|
17d2efb822
|
refactor: Organize protractor setup
|
2016-03-13 16:41:57 -05:00 |
|
Matteo Pagliazzi
|
8e3284a4e3
|
wip(shared): adapt to v3
|
2016-03-13 22:26:32 +01:00 |
|
Blade Barringer
|
0b65292e4b
|
test: Update protractor to v3 and use mocha
|
2016-03-13 09:51:01 -05:00 |
|
Matteo Pagliazzi
|
fbdbd8e006
|
Merge branch 'develop' into api-v3
|
2016-03-10 18:30:09 +01:00 |
|
Matteo Pagliazzi
|
bb6f0f4252
|
split user.fns
|
2016-03-08 18:58:39 +01:00 |
|
Blade Barringer
|
4cd0428f0a
|
Merge branch 'develop' into api-v3
|
2016-03-04 12:16:22 -06:00 |
|
Blade Barringer
|
511b003ec5
|
Merge pull request #6811 from crookedneighbor/upgrade_babel
chore: upgrade babel to v6
|
2016-03-04 08:36:08 -06:00 |
|
Blade Barringer
|
9447a6ce10
|
feat: pre-compile babel when used in production
|
2016-03-04 07:44:22 -06:00 |
|
Blade Barringer
|
7f4beb747f
|
Merge branch 'develop' into api-v3
|
2016-03-03 21:24:54 -06:00 |
|
Blade Barringer
|
b61cfefc30
|
fix: fix issue where build would fail but exit as if oy passed
|
2016-03-03 21:05:06 -06:00 |
|
Blade Barringer
|
0406142e0e
|
chore: upgrade babel to v6
|
2016-03-02 21:36:27 -06:00 |
|
Matteo Pagliazzi
|
8920b05f9e
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
|
2016-03-02 12:59:51 +01:00 |
|
Blade Barringer
|
c96ddaeebe
|
refactor: Remove unused common script src files
|
2016-03-01 08:49:25 -06:00 |
|
Matteo Pagliazzi
|
0c700cc36d
|
Merge branch 'develop' into api-v3
|
2016-02-29 16:39:31 +01:00 |
|