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

930 commits

Author SHA1 Message Date
Sabe Jones
1643e3dbc6 test(modals): Rehatch scenario 2015-11-30 16:19:12 -05:00
Sabe Jones
ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop 
Conflicts:
	website/views/options/social/challenge-box.jade
 2015-11-26 13:33:33 -05:00
Sabe Jones
3c672ea814 Merge pull request #6281 from TheHollidayInn/inventory-prevent-hatch-model-from-showing-on-hatched-pet 
Prevented modal from showing when user tries to hatch a pet they own
 2015-11-26 11:56:38 -06:00
Sabe Jones
5d02b70be1 Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix 
Two-handed weapons no longer automatically equip unless desired. fixes #6231
 2015-11-26 10:53:50 -06:00
Oliver Eyton-Williams
9bda5657d2 Fixed syntax for linter. 2015-11-25 12:40:40 +01:00
Oliver Eyton-Williams
707cd08a8b Merged: updating two-handed tests to use arrow functions. 2015-11-25 12:12:22 +01:00
Sabe Jones
28205663e4 fix(modals): Show mount modal more often 
Fixes #6288. Previously, we used a count of all properties within the user's items.pets.mounts to determine whether or not they'd gained a new mount. That would not work as expected if they had mounts with a null or false status, such as after using the Key to the Kennels. This commit also adds some tests to the inventory controller in Angular for pet raising.
 2015-11-24 16:54:59 -05:00
Alys
431eaec71a add a missing full stop to a message and to the associated test 2015-11-24 14:11:01 +10:00
Keith Holliday
b6e79f3ba8 Prevented modal from showing when user tries to hatch a pet they own 2015-11-23 10:20:39 -06:00
Blade Barringer
7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Alys
a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys
2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Alys
6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Alys
a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Sabe Jones
66725a561c fix(test): Remove only 2015-11-20 13:39:54 -05:00
Sabe Jones
e5d3e7bc83 fix(test): Linting and coverage 2015-11-20 13:36:41 -05:00
Sabe Jones
fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Blade Barringer
776faddb34 (chore): lint test/common files 2015-11-19 20:27:39 -06:00
Sabe Jones
31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Oliver Eyton-Williams
570d7c3c76 Added tests for buying two-handed weapons 2015-11-18 16:41:06 +01:00
Blade Barringer
eded44fea5 Adjust helper files for linting preferences. 2015-11-18 08:54:34 -06:00
Blade Barringer
f58b3eee64 Move special gear into own subdirectory 2015-11-17 17:06:00 -06:00
Sabe Jones
4bf20959dd refactor(stats): Math helpers ES2015 module 2015-11-17 15:41:26 -05:00
Blade Barringer
195b39561b Move contributor gear to own module 2015-11-17 09:01:38 -06:00
Blade Barringer
2bac9c3c17 Separate out backer gear into own module 2015-11-17 08:17:40 -06:00
Blade Barringer
639dfb31d7 Pull out gear into separate modules 2015-11-16 17:29:13 -06:00
Blade Barringer
ea87910c2f Correct test path 2015-11-15 12:34:40 -06:00
Blade Barringer
ea14326025 Adjust faq test 2015-11-15 10:18:10 -06:00
Blade Barringer
a127bb8711 Switch to babel-core form babel. 
Babel includes the CLI, which we don't need.
 2015-11-15 08:59:57 -06:00
Blade Barringer
037337d54f Remove extraneous anonymous function. 2015-11-15 08:24:42 -06:00
Blade Barringer
5be9b88cc6 Add babel compiler to mocha.opts 2015-11-15 08:24:19 -06:00
Blade Barringer
da881153b9 Convert coffee tests to js 2015-11-15 08:19:41 -06:00
Blade Barringer
c829eb21ed Removed unused mocha.opts 2015-11-14 21:50:47 -06:00
Blade Barringer
bc90893284 Correct test to declare variable 2015-11-14 21:45:20 -06:00
Blade Barringer
ff929b669d Convert common tests to js 2015-11-14 21:44:10 -06:00
Blade Barringer
7559f14f4d Remove coffee from files 2015-11-11 20:40:26 -06:00
Blade Barringer
3a13a5ee2c Remove unneeded coffeescript requires in tests. 2015-11-11 20:32:17 -06:00
Blade Barringer
6acd6460ea Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route 
Increase code coverage for clearflags route
 2015-11-11 18:49:37 -06:00
Blade Barringer
13da95b552 Add tests for clearflags route 2015-11-11 17:58:41 -06:00
Sabe Jones
06a5a1cb95 Merge pull request #6042 from HabitRPG/sabrecat/more-modals 
More and better modals; Social Media sharing
 2015-11-11 17:32:43 -06:00
Blade Barringer
117a254cc8 Patch exploit that would allow users to auto-delete messages 2015-11-11 06:46:11 -06:00
Blade Barringer
1fc21167dc Send back flag data if user had flagged the message. 2015-11-10 08:15:54 -06:00
Sabe Jones
eed4207c6d Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
 2015-11-09 16:24:17 -05:00
Blade Barringer
1e4570ff88 Move all delete user tests to new structure 2015-11-05 08:17:06 -06:00
Blade Barringer
cde66d6167 Merge pull request #6183 from crookedneighbor/clientIdentifier 
Client identifier
 2015-11-04 20:03:31 -06:00
Blade Barringer
797287a75c Add and adjust tests for new register behavior. 2015-11-04 17:40:49 -06:00
Blade Barringer
8618716ca4 Update requester to take in additional set parameters. 2015-11-04 17:40:10 -06:00
Blade Barringer
269fd2a94f Add test for admin flagging a message 2015-11-04 08:00:35 -06:00
Blade Barringer
799190a898 Merge branch 'develop' into flag_messages_in_api 2015-11-04 07:56:34 -06:00
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00