 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 |
|
|
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 |
|