Commit Graph

2513 Commits

Author SHA1 Message Date
Alys 431eaec71a add a missing full stop to a message and to the associated test 2015-11-24 14:11:01 +10:00
Matteo Pagliazzi 1bf91030c6 format express-validator errors 2015-11-23 21:34:21 +01:00
Matteo Pagliazzi 4a941deece remove success field from json responses 2015-11-23 21:04:21 +01:00
Keith Holliday b6e79f3ba8 Prevented modal from showing when user tries to hatch a pet they own 2015-11-23 10:20:39 -06:00
Blade Barringer 7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Matteo Pagliazzi 645095e58f fix errorHandler tests, add tests for res.respond 2015-11-23 13:28:25 +01:00
Matteo Pagliazzi 349122c9a1 add res.respond, fix linting 2015-11-23 13:01:47 +01:00
Matteo Pagliazzi a26f713e18 misc fixes, add ability to attach local auth to social user 2015-11-23 12:47:15 +01:00
Alys a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys 2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Blade Barringer 78cdc1753f tests(api): Add test for registering with an invalid email 2015-11-21 13:52:09 -06:00
Blade Barringer 49e7799baa tests(api): clean up code style of test file 2015-11-21 13:51:31 -06:00
Blade Barringer ade764acbd tests(helper): Allow route to register user to be variable based on api version. 2015-11-21 13:45:46 -06:00
Blade Barringer 4f6b765923 Merge branch 'api-v3' into api-v3-user 2015-11-21 09:43:58 -06:00
Blade Barringer 4dee29a20b tests(fix): Correct path to i18n.js module 2015-11-21 09:42:40 -06:00
Blade Barringer a54db44406 Merge branch 'api-v3' into api-v3-user 2015-11-21 09:20:44 -06:00
Blade Barringer b3e9872f59 tests: Adjust integration helper to display server errors for each API. 2015-11-21 09:20:08 -06:00
Blade Barringer 85a08f881b chore(lint): Correct linting errors in test files. 2015-11-21 09:19:48 -06:00
Matteo Pagliazzi 5c33a404fb handle mongoose validation errors, fix bug in import and add more tests for errors 2015-11-21 15:00:31 +01:00
Matteo Pagliazzi afbfbdd01c fix mongoose promise, some user validation, tests urls 2015-11-21 14:27:24 +01:00
Alys 6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Matteo Pagliazzi 3608742e20 fix bugs on user controller 2015-11-21 12:26:48 +01:00
Matteo Pagliazzi 444aff7d33 Merge branch 'api-v3' into api-v3-user 2015-11-21 12:11:25 +01:00
Matteo Pagliazzi 4862cebdb7 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2015-11-21 12:10:11 +01:00
Matteo Pagliazzi 041224b5ac fix merge conflicts 2015-11-21 12:09:40 +01:00
Matteo Pagliazzi 2f4e6e015a Merge branch 'api-v3-user' of github.com:HabitRPG/habitrpg into api-v3-user 2015-11-21 12:03:26 +01:00
Matteo Pagliazzi 7866f7393b clean up code, add deleteSocial method 2015-11-21 12:03:08 +01:00
Alys a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Blade Barringer 07247033b2 test: Add integration test for POST user/register/local 2015-11-20 19:14:07 -06:00
Sabe Jones 66725a561c fix(test): Remove only 2015-11-20 13:39:54 -05:00
Sabe Jones e5d3e7bc83 fix(test): Linting and coverage 2015-11-20 13:36:41 -05:00
Sabe Jones fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Blade Barringer 776faddb34 (chore): lint test/common files 2015-11-19 20:27:39 -06:00
Matteo Pagliazzi dd8c22584d req.t --> res.t 2015-11-19 12:17:44 +01:00
Matteo Pagliazzi 5c859ca52e add req.t in place of i18n.t passing req.language, begins implementing user signup 2015-11-18 22:04:36 +01:00
Sabe Jones 31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Blade Barringer 6991d5ab67 Correct reject block to include details about error 2015-11-18 13:01:56 -06:00
Blade Barringer f95c6ef927 Move notFound api v3 test to integration folder. 2015-11-18 13:01:35 -06:00
Matteo Pagliazzi 2dfca76a5e Merge pull request #6256 from HabitRPG/api-v3-apidoc
API v3 - apidoc wip
2015-11-18 17:12:14 +01:00
Oliver Eyton-Williams 570d7c3c76 Added tests for buying two-handed weapons 2015-11-18 16:41:06 +01:00
Blade Barringer 627da76b49 Merge branch 'develop' into api-v3 2015-11-18 09:09:49 -06:00
Blade Barringer eded44fea5 Adjust helper files for linting preferences. 2015-11-18 08:54:34 -06:00
Matteo Pagliazzi 3b633a87b9 try fixing the notFound test 2015-11-18 12:44:52 +01:00
Matteo Pagliazzi 65a8d2e255 misc fixes and improvements, starts adding route tests 2015-11-18 12:36:13 +01:00
Blade Barringer 08c4ec5557 Merge branch 'develop' into api-v3 2015-11-17 23:15:15 -06:00
Blade Barringer f58b3eee64 Move special gear into own subdirectory 2015-11-17 17:06:00 -06:00
Sabe Jones 4bf20959dd refactor(stats): Math helpers ES2015 module 2015-11-17 15:41:26 -05:00
Matteo Pagliazzi 2a51117d21 comment errors according to apidoc, add new tests and fix existing ones 2015-11-17 19:22:47 +01:00
Matteo Pagliazzi aa1b046cf2 add example apidoc comments, add notFound middleware 2015-11-17 16:48:50 +01:00
Blade Barringer 195b39561b Move contributor gear to own module 2015-11-17 09:01:38 -06:00