Commit graph

1556 commits

Author SHA1 Message Date
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
f4d2184f34 Merge pull request #7010 from HabitRPG/api-v3-adapt-v2
[API v3] Adapt v2
2016-04-09 17:42:44 +02:00
Matteo Pagliazzi
6b2d1a1416 v3 adapt v2: adapt common ops 2016-04-09 16:45:43 +02:00
Blade Barringer
231cfc176a Merge branch 'develop' into api-v3 2016-04-09 09:12:53 -05:00
Matteo Pagliazzi
910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Blade Barringer
db62d1add0 fix: correct coupon generation code 2016-04-09 08:03:32 -05: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
2d3fbe9f13 v3 adapt v2: lint client only shared ops and enable members integration tests 2016-04-07 11:54:36 +02:00
Matteo Pagliazzi
d49847688e v2 adapt to v3: port challenges create, get and list 2016-04-07 11:22:10 +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
Matteo Pagliazzi
b431b02012 v3 adapt v2: port tags, cast, cron, deletUser and removeMember. Fix a few bugs in v3 2016-04-06 19:28:43 +02: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
08239345b5 v3 adapt v2: port leave, join and invite for groups controller 2016-04-05 13:03:20 +02:00
Matteo Pagliazzi
374d11b0e4 v3 adapt v2: port chat routes and group.update 2016-04-05 12:02:00 +02: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
f6fc50f6c2 adapt v2: port updateUser 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
10583b78de fix challenge unit tests 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
c3945de098 fix tasks updating and reminders tests 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
f3abdaf692 adapt v2: port updateTask 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
382e391fd0 port updateTask, addTask, clearCompleted, taskDefaults, uuid 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
060e3b1045 adapt v2: fix linting 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
cc65bb1ed7 adapt v2: getTask, getTasks, clearCompleted, addTask, deleteTask, getUser, getUserAnonymized, scoreTask (challenge part missing) 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
58c20c2a64 v2 port: enable integration tests, port register route 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
68ff26e6d6 v3: check that tasks are deleted when the user deletes the acocunt and misc fixes 2016-04-04 17:16:36 +02:00
Matteo Pagliazzi
c86898c7e4 Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts 2016-04-04 11:49:06 +02:00
Matteo Pagliazzi
66959c23f5 Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both 2016-04-04 11:46:46 +02:00
Keith Holliday
c916c74775 Ported release both, added unit tests, add release both route with integration tests 2016-04-03 14:44:00 -05:00
Keith Holliday
487a26ec43 Ported release pets, added unit tests, added route with integration tests 2016-04-03 14:37:20 -05:00
Keith Holliday
24b7b4c838 Ported release mounts, add unit tests, added release mounts route with integration tests 2016-04-03 14:34:43 -05:00
Matteo Pagliazzi
de74fae0b4 v3: port coupons 2016-04-02 16:37:55 +02:00
Matteo Pagliazzi
3b98fe377f Merge pull request #6999 from piousbox/shared-code-update-stats
Shared code update stats
2016-04-01 23:16:35 +02:00
Victor Piousbox
7f3feedd12 shared-code-update-stats 2016-04-01 20:50:28 +00:00
Matteo Pagliazzi
843dd09d35 Merge pull request #6986 from HabitRPG/api-v3-one-app
[Api v3] Consolidate server code and share middlewares where possible
2016-04-01 19:30:52 +02:00
Matteo Pagliazzi
6cbbdcdcbe v3: port static pages, make routes lib more flexible, share middlewares between v2 and v3, port v1, simplify server.js 2016-04-01 19:07:03 +02:00
Matteo Pagliazzi
238dee7608 Merge pull request #6962 from piousbox/shared-code-user-score-task
shared-code-user-score-task
2016-04-01 18:28:55 +02:00
Victor Piousbox
e6e2c26a12 shared-code-user-score-task 2016-04-01 16:11:37 +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
82afc1971d Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card 2016-04-01 16:30:48 +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
6d9617e345 Ported read card, added unit tests, added read card route and integration tests 2016-04-01 09:17:40 -05:00