 Blade Barringer
|
66083f766c
|
Merge branch 'api-v3' into api-v3-groups
|
2016-01-18 18:04:20 -06:00 |
|
|
Blade Barringer
|
32a2b3121e
|
Merge branch 'develop' into api-v3
|
2016-01-18 18:04:07 -06:00 |
|
|
Kristian Tashkov
|
5b740b1a11
|
Fix setting of environment variables in gulp test tasks in Windows
See this stackoverflow link for why this is necessary
http://stackoverflow.com/questions/27084392/code-coverage-for-mocha-in-windows-7/27193866#27193866
|
2016-01-18 16:55:15 -06:00 |
|
|
Blade Barringer
|
477603539e
|
Merge branch 'api-v3' into api-v3-groups
|
2016-01-18 11:24:55 -06:00 |
|
|
Blade Barringer
|
64c4f0f94a
|
Merge branch 'develop' into api-v3
|
2016-01-18 11:24:34 -06:00 |
|
|
Blade Barringer
|
79f2dc6b1a
|
tests: Update gulp task to use npm scripts
|
2016-01-18 11:10:22 -06:00 |
|
|
Matteo Pagliazzi
|
e2edb974d7
|
Merge branch 'api-v3' into api-v3-groups
|
2016-01-13 18:40:04 +01:00 |
|
|
Matteo Pagliazzi
|
914b2eb008
|
Merge branch 'develop' into api-v3
|
2016-01-13 18:39:44 +01:00 |
|
|
Blade Barringer
|
8a19a84f3f
|
lint(tests): Add e2e tests to linter
|
2016-01-06 20:52:24 -06:00 |
|
|
Blade Barringer
|
76c97dfa6e
|
Merge branch 'api-v3' into api-v3-groups
|
2016-01-02 22:29:59 -06:00 |
|
|
Blade Barringer
|
37916271e8
|
Merge branch 'develop' into api-v3
|
2016-01-02 22:29:03 -06:00 |
|
|
Blade Barringer
|
262d04e14c
|
lint(tests): Re-enable inting for api tests
|
2016-01-02 18:27:27 -06:00 |
|
|
Blade Barringer
|
90cd322af5
|
Merge branch 'api-v3' into api-v3-groups
|
2015-12-31 15:50:46 -06:00 |
|
|
Blade Barringer
|
3a0e7149f6
|
Merge branch 'develop' into api-v3
|
2015-12-31 15:50:34 -06:00 |
|
|
Blade Barringer
|
0d75d5b541
|
lint: Move test eslint rules to .eslintrc in test directory
|
2015-12-31 15:46:47 -06:00 |
|
|
Blade Barringer
|
6f220c6869
|
lint: Turn on linting for v3 group tests
|
2015-12-31 08:57:20 -06:00 |
|
|
Matteo Pagliazzi
|
a44090e1ed
|
Merge branch 'api-v3' into api-v3-groups
|
2015-12-29 18:17:36 +01:00 |
|
|
Blade Barringer
|
bce049a316
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
|
2015-12-29 08:06:22 -06:00 |
|
|
Blade Barringer
|
b3050e5a67
|
chore(dependency): Upgrade lodash from v2 to v3
|
2015-12-29 07:45:03 -06:00 |
|
|
Matteo Pagliazzi
|
20092f3ddb
|
port challenge model
|
2015-12-28 10:46:34 +01:00 |
|
|
Blade Barringer
|
e5c9924141
|
lint: Ignore rule for one-var in tests
|
2015-12-26 08:13:45 -06:00 |
|
|
Matteo Pagliazzi
|
bf7fc985d0
|
begins porting group model to es6
|
2015-12-16 20:00:10 +01:00 |
|
|
Matteo Pagliazzi
|
cc7bd1b5ac
|
disable server_side (api v2) tests for api v3
|
2015-12-16 11:17:56 +01:00 |
|
|
Matteo Pagliazzi
|
a46fa873a9
|
disable common tests for api v3
|
2015-12-16 11:16:30 +01:00 |
|
|
Matteo Pagliazzi
|
7d53a4fd54
|
port task model to es6 and implement discriminators
|
2015-11-27 19:06:26 +01:00 |
|
|
Blade Barringer
|
4f6b765923
|
Merge branch 'api-v3' into api-v3-user
|
2015-11-21 09:43:58 -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
|
85a08f881b
|
chore(lint): Correct linting errors in test files.
|
2015-11-21 09:19:48 -06: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 |
|
|
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 |
|
|
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 |
|
|
Blade Barringer
|
a64085828b
|
Correct path to api-v3 integration files in gulp test task.
|
2015-11-18 13:01:06 -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 |
|
|
Blade Barringer
|
627da76b49
|
Merge branch 'develop' into api-v3
|
2015-11-18 09:09:49 -06:00 |
|
|
Blade Barringer
|
22c8a24d15
|
Move test specific eslint rules to eslint task
|
2015-11-18 08:50:03 -06: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
|
e6a5d08150
|
Merge branch 'develop' into api-v3
|
2015-11-16 17:34:30 -06:00 |
|