 Matteo Pagliazzi
|
7086fbfbd6
|
add res.respond middleware... and use it in user controller
|
2015-11-23 13:07:21 +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 |
|
|
Matteo Pagliazzi
|
3459b51cef
|
use throw instead of returning next inside of promises
|
2015-11-23 10:20:07 +01:00 |
|
|
Matteo Pagliazzi
|
6d238a0770
|
fix .eslintrc
|
2015-11-23 10:09:17 +01:00 |
|
|
Matteo Pagliazzi
|
dcfd7eb6d0
|
Merge pull request #6274 from crookedneighbor/api-v3-user-local-spike
Api v3 user local spike
|
2015-11-22 11:59:28 +01:00 |
|
|
Blade Barringer
|
867efd7078
|
fix(controller): Adjust next calls to throw errors instead inside promise
|
2015-11-21 17:01:56 -06:00 |
|
|
Blade Barringer
|
d1839b816e
|
chore(lint): Clean up user model and controller
|
2015-11-21 16:17:42 -06:00 |
|
|
Blade Barringer
|
074b3f5079
|
fix(controller): Validate params for register route in user controller
|
2015-11-21 14:57:59 -06:00 |
|
|
Blade Barringer
|
75cea0c810
|
refactor(model): Remove password and passwordConfirmation from user model
|
2015-11-21 14:56:44 -06:00 |
|
|
Blade Barringer
|
43ef4e51b5
|
fix(model): Remove pre validation from user model
|
2015-11-21 14:56:20 -06:00 |
|
|
Blade Barringer
|
7ce554c578
|
fix(controller): Correct path to EmailUnsubscription model
|
2015-11-21 14:41:07 -06: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
|
1166601510
|
Merge branch 'develop' into api-v3
|
2015-11-21 09:37:34 -06:00 |
|
|
Blade Barringer
|
9a76e7a62c
|
chore(gulp): Add convience task for starting up a test server.
|
2015-11-21 09:33:29 -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 |
|
|
Matteo Pagliazzi
|
3608742e20
|
fix bugs on user controller
|
2015-11-21 12:26:48 +01:00 |
|
|
Matteo Pagliazzi
|
22464f53e9
|
put back linting on emailUnsubscription model
|
2015-11-21 12:12:48 +01:00 |
|
|
Matteo Pagliazzi
|
2e02e1bd5a
|
Merge branch 'api-v3' into api-v3-user
|
2015-11-21 12:12:15 +01:00 |
|
|
Matteo Pagliazzi
|
f87d6d250a
|
remove unlinted file
|
2015-11-21 12:11:53 +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 |
|
|
Blade Barringer
|
07247033b2
|
test: Add integration test for POST user/register/local
|
2015-11-20 19:14:07 -06:00 |
|
|
Blade Barringer
|
e4827f1b78
|
fix(user ctrl): Correct path to use model import
|
2015-11-20 19:08:25 -06:00 |
|
|
Blade Barringer
|
2fa2e0f483
|
fix(api tests): Let api test script pass the correct api version for helper.
|
2015-11-20 19:02:08 -06:00 |
|
|
Blade Barringer
|
a6fb5790e5
|
refactor(gulp): Dry out linting task
|
2015-11-20 07:56:59 -06:00 |
|
|
Blade Barringer
|
776faddb34
|
(chore): lint test/common files
|
2015-11-19 20:27:39 -06:00 |
|
|
Sabe Jones
|
bdf1c82b39
|
chore(news): Misc Bailey
|
2015-11-19 21:22:38 -05:00 |
|
|
Matteo Pagliazzi
|
c87200f582
|
comment out incomplete code
|
2015-11-19 22:04:18 +01:00 |
|
|
Matteo Pagliazzi
|
e028af9f3f
|
add social login / signup and misc fixes
|
2015-11-19 21:50:23 +01:00 |
|
|
Matteo Pagliazzi
|
972cbbdaa6
|
try moving all the logic to the model
|
2015-11-19 21:09:39 +01:00 |
|
|
Matteo Pagliazzi
|
55d743ebe5
|
remove q import
|
2015-11-19 16:29:22 +01:00 |
|
|
Matteo Pagliazzi
|
5874e89e2a
|
simplify code
|
2015-11-19 16:22:16 +01:00 |
|
|
Matteo Pagliazzi
|
dd8c22584d
|
req.t --> res.t
|
2015-11-19 12:17:44 +01:00 |
|
|
Matteo Pagliazzi
|
6451264572
|
start porting register local user handler, several bug fixes
|
2015-11-19 12:13:54 +01:00 |
|
|
Blade Barringer
|
5947dcf68b
|
(chore): Add lint:watch task
|
2015-11-18 17:23:33 -06:00 |
|
|
Alys
|
cb1f745d39
|
Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
|
2015-11-19 07:09:14 +10: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 |
|
|
Matteo Pagliazzi
|
662c9ecc29
|
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3-user
|
2015-11-18 20:50:15 +01:00 |
|