78 Commits

Author	SHA1	Message	Date
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
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	7d53a4fd54	port task model to es6 and implement discriminators	2015-11-27 19:06:26 +01: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	f87d6d250a	remove unlinted file	2015-11-21 12:11:53 +01:00
Matteo Pagliazzi	041224b5ac	fix merge conflicts	2015-11-21 12:09:40 +01: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
Blade Barringer	5947dcf68b	(chore): Add lint:watch task	2015-11-18 17:23:33 -06: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
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	00055ad055	Merge branch 'develop' into api-v3	2015-11-15 14:57:41 -06: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
Blade Barringer	6e8e1648d9	Merge branch 'develop' into api-v3	2015-11-13 07:38:24 -06:00
Blade Barringer	7559f14f4d	Remove coffee from files	2015-11-11 20:40:26 -06:00
Matteo Pagliazzi	8864508482	rewrite server.js in es6	2015-11-11 11:58:15 +01:00
Matteo Pagliazzi	4b60698527	migrate user model to new code style and es6	2015-11-08 16:11:55 +01:00
Matteo Pagliazzi	3135613be3	tweaks eslint rules, fixes gulp-eslint, adds some comments	2015-11-04 18:50:08 +01:00
Matteo Pagliazzi	235f1977ba	finish .eslintrc file and update gulp task	2015-11-04 18:26:38 +01:00
Matteo Pagliazzi	5ac46716a3	add eslint tasks to gulp, remove .jshintrc	2015-09-25 15:44:45 +02:00