247 Commits

Author	SHA1	Message	Date
Matteo Pagliazzi	fbdbd8e006	Merge branch 'develop' into api-v3	2016-03-10 18:30:09 +01:00
Matteo Pagliazzi	bb6f0f4252	split user.fns	2016-03-08 18:58:39 +01:00
Blade Barringer	4cd0428f0a	Merge branch 'develop' into api-v3	2016-03-04 12:16:22 -06:00
Blade Barringer	511b003ec5	Merge pull request #6811 from crookedneighbor/upgrade_babel ... chore: upgrade babel to v6	2016-03-04 08:36:08 -06:00
Blade Barringer	9447a6ce10	feat: pre-compile babel when used in production	2016-03-04 07:44:22 -06:00
Blade Barringer	7f4beb747f	Merge branch 'develop' into api-v3	2016-03-03 21:24:54 -06:00
Blade Barringer	b61cfefc30	fix: fix issue where build would fail but exit as if oy passed	2016-03-03 21:05:06 -06:00
Blade Barringer	0406142e0e	chore: upgrade babel to v6	2016-03-02 21:36:27 -06:00
Matteo Pagliazzi	8920b05f9e	Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3	2016-03-02 12:59:51 +01:00
Blade Barringer	c96ddaeebe	refactor: Remove unused common script src files	2016-03-01 08:49:25 -06:00
Matteo Pagliazzi	0c700cc36d	Merge branch 'develop' into api-v3	2016-02-29 16:39:31 +01:00
Matt Harrington	46e13fecad	TEST_DB_URI env override	2016-02-25 00:08:24 +00:00
Matteo Pagliazzi	9ef4b6409e	Merge branch 'develop' into api-v3 and move new relic to new location	2016-02-22 11:43:35 +01:00
Alys	f631712a45	deemphasise the warning that spritesheets might be too large for mobile safari - ref https://github.com/HabitRPG/habitrpg/pull/6683#issuecomment-185462180	2016-02-18 18:52:09 +10:00
Matteo Pagliazzi	edaf3ef4db	fix typo: 1028->1024 bytes	2016-02-12 19:50:50 +01:00
Matteo Pagliazzi	599510aa78	higher maxBuffer for integration tests	2016-02-12 19:49:53 +01:00
Matteo Pagliazzi	0084a0d057	move tests to gulp tasks	2016-01-29 19:09:19 +01:00
Matteo Pagliazzi	e345fa76f5	failing unit test	2016-01-29 12:07:46 +01:00
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