sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 13:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13426 commits 1 branch 0 tags 1.6 GiB
Commit graph

288 commits

Author SHA1 Message Date
Blade Barringer
e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Lucas Braun
ee9dc7c196 Remove extra 'it' from spec description 2016-03-29 22:11:36 -04:00
Blade Barringer
22c83c92c2 Merge pull request #6904 from HabitRPG/inventory_sorting_debug 
Inventory sorting debug
 2016-03-18 07:33:45 -05:00
Blade Barringer
de2f9eb28b Update tests to us set by default 2016-03-17 17:28:46 -05:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Kaitlin Hipkin
0ca949b1bb pull initialization of controller into helper method and stub state 2016-03-16 23:50:16 -04:00
Kaitlin Hipkin
469ece70c3 clean up party {up,on} tests, add calls to $controller after setup 2016-03-16 22:32:24 -04:00
Kaitlin Hipkin
ee09bee1e2 use sandbox.stub instead of sandbox.spy 2016-03-16 00:55:20 -04:00
Blade Barringer
9508ed45df refactor: Move order by equipmentment button to top of view 2016-03-15 19:41:11 -05:00
Matt Harrington
a6fb945120 inventory sorting 
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
 2016-03-15 19:41:11 -05:00
Kaitlin Hipkin
68c3c2973b cannot spy on an undefined function 2016-03-15 19:49:33 -04:00
Kaitlin Hipkin
c0e636dba0 fix spy? 2016-03-15 18:36:36 -04:00
Kaitlin Hipkin
93c5cc0385 add tests for awarding party {up,on} achievs 2016-03-15 16:03:36 -04:00
Blade Barringer
92657fa8af refactor: Remove unused code in test 2016-01-18 22:40:11 -06:00
Jason Vinson
2989057dd3 Fix for issue #5182: Allow cancel editing group infobox 2016-01-18 22:39:06 -06:00
Georgi Gardev
ea54ec607a Add confirmation popover for Release pets/mounts 
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
 2015-12-28 21:37:38 -06:00
Georgi Gardev
f6f82cafc4 Add confirmation popover for Rebirth 
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
 2015-12-28 21:37:23 -06:00
Blade Barringer
d53ac4c66f tests: Add ability to use ES2015 in karma tests 2015-12-28 08:24:23 -06:00
Blade Barringer
d0e6dbe103 fix: Remove only call from tests 2015-12-26 19:04:14 -06:00
Blade Barringer
7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00
Blade Barringer
d36755b64a tests: Remove unnecessary describe closure in auth ctrl spec 2015-12-26 19:00:44 -06:00
Sabe Jones
e638661c71 Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message 
Changed language when deleteing tasks to indicate type and text of task
 2015-12-14 14:30:06 -06:00
Keith Holliday
215cf840b1 Added tests for removing task 2015-12-08 12:40:43 -06:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
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
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
Keith Holliday
b6e79f3ba8 Prevented modal from showing when user tries to hatch a pet they own 2015-11-23 10:20:39 -06:00
Sabe Jones
aad3e5ade6 fix(sharing): Add social service to Inventory 
Also fixes accidental 'only' in tests.
 2015-10-28 16:52:07 -04:00
Sabe Jones
f4ea6c1d5d feat(sharing): Opt Out WIP 
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
 2015-10-28 16:36:47 -04:00
Ricardo Mendes
c462e65942 typo 2015-10-04 13:34:51 +01:00
Blade Barringer
be3decf859 Merge branch 'develop' into refactor-content 2015-10-01 21:20:04 -05:00
TheHollidayInn
bfca612be2 Moved intial filtering to a scope function and added test 2015-09-24 16:39:53 -05:00
Blade Barringer
955c163544 Merge branch 'develop' into refactor-content 2015-09-23 07:52:36 -05:00
Sabe Jones
389b5b370a feat(pets): Magic Hatching Potions WIP 2015-09-21 17:12:23 -04:00
Sabe Jones
87f6af346a fix(misc): Tweaks 
* Updates the text shown for Mystic Hourglasses in the inventory to account for new features.
* Fixes the date range for the Fall Festival to correctly start September 21.
* Updates test for the Inventory Controller to use lodash for object key iteration.
 2015-09-21 13:59:00 -04:00
Blade Barringer
ca6137a24e Remove unneeded file 2015-09-19 09:11:51 -05:00
LuneFox
91a0e0452e added match for askQuestion 2015-09-19 01:12:30 +03:00
Blade Barringer
8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones
15cddabd80 fix(test): Remove only 2015-09-16 19:21:05 -04:00
Sabe Jones
f8db8f597a refactor(test): Give user mystery items 
...instead of stubbing out timeTravelerStore
 2015-09-16 19:16:21 -04:00
Sabe Jones
98cd8364c6 feat(hourglass): Individual filter functions 2015-09-16 16:35:04 -04:00
Sabe Jones
2bde07fa1c fix(test): Call hasAll correctly 2015-09-16 16:12:29 -04:00
Sabe Jones
7cc29810f3 fix(test): inject Content 
Also refactors to remove lodash where it's overkill.
 2015-09-16 16:01:13 -04:00
Sabe Jones
3bfeb15715 test(hourglass): TDD for Time Travel filtering 2015-09-16 15:27:19 -04:00
Blade Barringer
78fe1073d4 Add user sync to sendAction 2015-09-15 16:39:08 -05:00
Blade Barringer
b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Blade Barringer
5553d74334 Create method to calculate whether or not user has attained all mystery equipment 2015-09-13 16:26:29 -05:00