56 Commits

Author	SHA1	Message	Date
Matteo Pagliazzi	7e093f1622	Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2	2016-04-01 16:28:20 +02:00
Keith Holliday	ad0bc58028	Ported purchase, add unit tests, created new user purchase route, and added tests	2016-04-01 08:14:15 -05:00
Keith Holliday	dd12443166	Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests	2016-04-01 08:11:26 -05:00
Matteo Pagliazzi	3002c9b7fd	v3: port getBuyList and shared.updateStore	2016-03-26 16:25:15 +01:00
Keith Holliday	d7b6e0b760	Ported refPush and added tests	2016-03-25 08:33:55 -05:00
Matteo Pagliazzi	192409a0b5	Merge branch 'api-v3' into api-v3-equip-feed-hatch2	2016-03-25 12:22:55 +01:00
Matteo Pagliazzi	0a65e6a6f1	v3: port hatch, equip and feed ops	2016-03-24 18:59:09 +01:00
Matteo Pagliazzi	159b9eaa8d	port disable classes and change class ops	2016-03-24 14:25:30 +01:00
Matteo Pagliazzi	bd3c162b97	port allocateNow and autoAllocate	2016-03-20 20:21:15 +01:00
Matteo Pagliazzi	ff72706cae	wip(shared): port buy ops and linked fns	2016-03-19 16:04:27 +01:00
Matteo Pagliazzi	219ec01ce9	port shared.ops.allocate	2016-03-15 18:41:23 +01:00
Matteo Pagliazzi	490c6a9ae1	wip(shared): port sleep op	2016-03-15 16:33:44 +01:00
Matteo Pagliazzi	f65a7321b7	fix common tests, explictly exclude tests from linting	2016-03-13 23:00:48 +01:00
Matteo Pagliazzi	8e3284a4e3	wip(shared): adapt to v3	2016-03-13 22:26:32 +01:00
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
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	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
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