sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13135 commits 3 branches 0 tags 1.6 GiB
Commit graph

220 commits

Author SHA1 Message Date
Matteo Pagliazzi
de74fae0b4 v3: port coupons 2016-04-02 16:37:55 +02:00
Victor Piousbox
7f3feedd12 shared-code-update-stats 2016-04-01 20:50:28 +00:00
Matteo Pagliazzi
aae94bf1b4 Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3 2016-04-01 16:39:52 +02:00
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
3fe88fd8d0 Ported open mystery item, added unit tests, added route, and integration tests 2016-04-01 08:23:40 -05: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
3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02: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
Blade Barringer
f33469609c Adjust sprite task to not include wheelchair images in the customize-option handling 2016-03-24 07:57:50 -05: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
3db06c6537 Merge branch 'develop' into api-v3 2016-03-15 19:23:23 +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
Blade Barringer
17d2efb822 refactor: Organize protractor setup 2016-03-13 16:41:57 -05:00
Matteo Pagliazzi
8e3284a4e3 wip(shared): adapt to v3 2016-03-13 22:26:32 +01:00
Blade Barringer
0b65292e4b test: Update protractor to v3 and use mocha 2016-03-13 09:51:01 -05: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
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