Matteo Pagliazzi
3459b51cef
use throw instead of returning next inside of promises
2015-11-23 10:20:07 +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
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
444aff7d33
Merge branch 'api-v3' into api-v3-user
2015-11-21 12:11:25 +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
e4827f1b78
fix(user ctrl): Correct path to use model import
2015-11-20 19:08:25 -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
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
bd980e166b
fix action method
2015-11-18 18:16:14 +01:00
Matteo Pagliazzi
de75849c7a
fix apidoc comment
2015-11-18 18:06:37 +01:00
Matteo Pagliazzi
d5d13477d7
wip user controllers: local login method
2015-11-18 18:02:35 +01: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
Matteo Pagliazzi
65a8d2e255
misc fixes and improvements, starts adding route tests
2015-11-18 12:36:13 +01:00
Matteo Pagliazzi
6fb4fdfd8a
create apidoc task in grunt, update package.json version
2015-11-18 11:50:55 +01:00
Blade Barringer
08c4ec5557
Merge branch 'develop' into api-v3
2015-11-17 23:15:15 -06:00
Blade Barringer
c452cf9f99
Adjust styling of noscript block
2015-11-17 21:35:07 -06:00
Blade Barringer
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06:00
Blade Barringer
5b7c02334a
Adjust sm modal to not attach objects on rootScope
2015-11-17 21:23:20 -06:00
Gautham Chandra
37e08e8d5d
Converted noscript text into translatable strings
2015-11-17 22:22:55 -05:00
Blade Barringer
b280267cde
Expand object to make it more readable.
2015-11-17 21:10:29 -06:00
Blade Barringer
05eb0ec782
Add missing comma.
2015-11-17 17:26:18 -06:00
Sabe Jones
f5f33bd1b9
fix(modals): SM modal fixes
...
Fixes #6253 , allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042 .
2015-11-17 16:56:11 -05:00
Matteo Pagliazzi
18503e31c3
fix linting
2015-11-17 19:31:51 +01: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
846800ccc9
fix linting
2015-11-17 17:49:59 +01:00
Matteo Pagliazzi
9905deec06
move static handler to separate middleware
2015-11-17 17:02:53 +01:00
Matteo Pagliazzi
aa1b046cf2
add example apidoc comments, add notFound middleware
2015-11-17 16:48:50 +01:00
Oliver Eyton-Williams
53417adda1
Replaced magic numbers with variables
2015-11-17 14:07:35 +01:00
Blade Barringer
8b7f50bfcf
Adjust memory leak message to be meaningful.
...
Got this message in the heroku logs:
2015-11-17T04:28:18.549451+00:00 app[web.1]: '[Memory Leak] Memory=' + parseFloat(memory).toFixed(3) + ' Time=' + moment()
Converted the line into a variable and threw that instead.
2015-11-16 22:34:06 -06:00
Blade Barringer
e6a5d08150
Merge branch 'develop' into api-v3
2015-11-16 17:34:30 -06:00
Sabe Jones
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
Sabe Jones
2d1ad12cbd
fix(strings): Make plural more greppable
2015-11-16 17:08:38 -05:00
Sabe Jones
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
