11 Commits

Author	SHA1	Message	Date
Blade Barringer	850aeb6565	Merge branch 'develop' into api-v3	2015-12-13 16:41:08 -06:00
Blade Barringer	883fd14775	tests(lint): remove unused variables	2015-12-13 16:40:44 -06:00
Blade Barringer	65bb655a10	Merge branch 'develop' into api-v3	2015-12-13 16:39:59 -06:00
Blade Barringer	9ec26a8ee9	tests(common): Use generateUser helper in dailies test	2015-12-13 16:29:29 -06:00
Matteo Pagliazzi	5fa514b6fa	Merge branch 'develop' into api-v3	2015-11-27 17:05:29 +01:00
Alys	6183fd9e71	refactor api.startOfWeek to a cron.js function not exposed on api	2015-11-21 22:26:05 +10:00
Matteo Pagliazzi	041224b5ac	fix merge conflicts	2015-11-21 12:09:40 +01:00
Blade Barringer	776faddb34	(chore): lint test/common files	2015-11-19 20:27:39 -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	037337d54f	Remove extraneous anonymous function.	2015-11-15 08:24:42 -06:00
Blade Barringer	ff929b669d	Convert common tests to js	2015-11-14 21:44:10 -06:00