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
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
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
Blade Barringer
a64085828b
Correct path to api-v3 integration files in gulp test task.
2015-11-18 13:01:06 -06: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
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
Blade Barringer
22c8a24d15
Move test specific eslint rules to eslint task
2015-11-18 08:50:03 -06:00
Blade Barringer
f94394127a
Remove unused var
2015-11-18 08:00:14 -06:00
Blade Barringer
9e557c43d3
Fix bug where seasonal items could not be purchased.
2015-11-18 07:58:01 -06:00
Blade Barringer
26b82dff4b
Fix bug where armoire items could not be repurchased.
2015-11-18 07:57:45 -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
Matteo Pagliazzi
b5adf9f19b
add apidoc to production build step
2015-11-18 11:52: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
553548046f
Add linting for tests
2015-11-17 23:14:49 -06:00
Blade Barringer
94bf181301
Add noscript locales
2015-11-17 22:02:57 -06:00
Blade Barringer
0a7d7fc42d
Merge pull request #6251 from crookedneighbor/modularize-content-gear
...
Pull out gear into separate modules
2015-11-17 21:57:13 -06:00
Blade Barringer
4d415ee9c1
chore(i18n): update locales
2015-11-17 21:54:30 -06:00
Blade Barringer
fba35ea491
chore(i18n): update locales
2015-11-17 21:48:55 -06:00
Blade Barringer
6bd0ed76cc
Fixes #6524 . Correct spelling of community
2015-11-17 21:41:06 -06:00
Blade Barringer
71473a93ad
chore(i18n): update locales
2015-11-17 21:38:32 -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
Blade Barringer
a11048b604
Split out wondercon gear into separate module
2015-11-17 17:16:38 -06:00
Blade Barringer
f58b3eee64
Move special gear into own subdirectory
2015-11-17 17:06:00 -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
Blade Barringer
195b39561b
Move contributor gear to own module
2015-11-17 09:01:38 -06:00
Blade Barringer
2bac9c3c17
Separate out backer gear into own module
2015-11-17 08:17:40 -06:00
Blade Barringer
03c1a957f6
Correct ownsItem function to allow owning item if user has ever previously owned the item.
2015-11-17 08:13:20 -06:00