154 Commits

Author	SHA1	Message	Date
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
Blade Barringer	8f9224c2ae	Adjust error handling for test task.	2015-11-16 12:23:09 -06:00
Blade Barringer	086e1da0e1	Merge branch 'develop' into api-v3	2015-11-16 12:04:42 -06:00
Blade Barringer	7a865b5c2a	Correct test output agregator	2015-11-16 12:04:09 -06:00
Blade Barringer	49fd6b9f5c	Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3	2015-11-15 14:59:57 -06:00
Blade Barringer	00055ad055	Merge branch 'develop' into api-v3	2015-11-15 14:57:41 -06:00
Blade Barringer	a127bb8711	Switch to babel-core form babel. ... Babel includes the CLI, which we don't need.	2015-11-15 08:59:57 -06:00
Blade Barringer	2e16bade2b	Add lint task to test command.	2015-11-15 08:28:16 -06:00
Blade Barringer	5be9b88cc6	Add babel compiler to mocha.opts	2015-11-15 08:24:19 -06:00
Blade Barringer	6f11054994	Add trailing comma	2015-11-15 08:10:54 -06:00
Blade Barringer	351172d178	Correct common test command to compile with babel.	2015-11-14 21:52:59 -06:00
Matteo Pagliazzi	170a25c712	remove v2 utils where possible	2015-11-14 17:43:56 +01:00
Matteo Pagliazzi	b315d10c79	migrate utils to v3, uprade nodemailer	2015-11-14 17:43:56 +01:00
Blade Barringer	c3b4f03c35	Add linting for common files	2015-11-14 07:49:48 -06:00
Blade Barringer	7ec9687774	Add linting from api-v3	2015-11-14 07:40:05 -06:00
Matteo Pagliazzi	79c20105a1	use new logger where possible	2015-11-13 15:16:00 +01:00
Blade Barringer	6e8e1648d9	Merge branch 'develop' into api-v3	2015-11-13 07:38:24 -06:00
Blade Barringer	858bf99930	Move old logging lib v2 directory	2015-11-12 08:18:23 -06:00
Blade Barringer	7559f14f4d	Remove coffee from files	2015-11-11 20:40:26 -06:00
Blade Barringer	25ae2e4252	Move browserify task to gulp	2015-11-11 20:32:17 -06:00
Matteo Pagliazzi	8864508482	rewrite server.js in es6	2015-11-11 11:58:15 +01:00
Matteo Pagliazzi	3795b1d151	wip: starts upgrading lodash to v3	2015-11-11 10:32:49 +01:00
Blade Barringer	d6764d4f37	Merge branch 'develop' into api-v3	2015-11-09 12:52:25 -06:00
Blade Barringer	6b7a757459	Run tests in sequence	2015-11-09 12:47:56 -06:00
Matteo Pagliazzi	5b3c460344	Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3	2015-11-08 16:14:10 +01:00
Matteo Pagliazzi	4b60698527	migrate user model to new code style and es6	2015-11-08 16:11:55 +01:00