Commit Graph

91 Commits

Author SHA1 Message Date
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
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 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 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 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
Blade Barringer 50b709045d Remove only from test 2015-09-13 16:24:46 -05:00
Blade Barringer 5e9b74a2b9 Add test for addHourglass 2015-09-13 10:01:14 -05:00
Blade Barringer 7e97b73e8b Add test for addTenGems 2015-09-13 09:59:46 -05:00
Blade Barringer edbdab5912 Add test shells for debug mode functions 2015-09-13 09:47:34 -05:00
Blade Barringer 4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page
Party Page Revamp
2015-09-06 13:28:14 -05:00
Blade Barringer f1224bc6be Use select instead of an input for cds 2015-09-06 09:36:29 -05:00
Blade Barringer 9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer c141ee6d1c Fix test 2015-09-05 08:14:55 -05:00
Blade Barringer 5b583f43d6 Fix api and karma test 2015-08-24 18:07:21 -05:00
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 93f02363e5 Add feature to join new party if user is in a party of one 2015-08-22 12:19:37 -05:00
Blade Barringer 8c66714e5f Convert methods to use sandbox 2015-08-22 11:54:03 -05:00
Blade Barringer 1ff597e944 Provide group name if not provided and save 2015-08-22 08:40:16 -05:00
Blade Barringer 07b9b35234 Filter out blank emails 2015-08-21 21:39:04 -05:00
Blade Barringer 59dc0cdb4f Add method to remove blank uuids 2015-08-21 21:28:52 -05:00
Blade Barringer 3153fbac3c Fix bug where mutliple user ids could not be saved 2015-08-21 08:19:39 -05:00
Blade Barringer 7f834429ac Add test for clickStartQuest 2015-08-18 08:19:04 -05:00
Blade Barringer 861a90a562 Use rootScope as variable 2015-08-18 08:18:53 -05:00
Blade Barringer be87f69cd4 Actually save copy message modal spec 2015-08-18 08:10:38 -05:00
Blade Barringer fe22f76e30 Move copy message modal controller spec to own file 2015-08-18 08:06:46 -05:00
Blade Barringer 3f48364a4a Move autocomplete controller to own file 2015-08-18 08:05:56 -05:00
Blade Barringer a032c80aaf Move chat controller to own spec file 2015-08-18 08:05:35 -05:00
Blade Barringer a749e2d9f7 Move party controller to own spec 2015-08-18 08:04:17 -05:00
Blade Barringer 25d52bccc5 Use new newUser specHelper syntax 2015-08-15 00:08:41 -05:00
Sabe Jones ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards
Greeting and Thank-You Cards
2015-08-13 22:35:25 -05:00
Blade Barringer bcf7c9712e Split out potion and armoire out of the itemStore object
Fixes #5743
2015-08-12 18:53:49 -05:00
Blade Barringer 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Blade Barringer 01237df213 Add buttons to challenge participant modal 2015-08-03 08:40:33 -05:00
Blade Barringer 7c43f87858 Add test for discard method 2015-07-24 17:30:48 -05:00
Blade Barringer 60ee0c911f Add test for edit 2015-07-24 17:30:48 -05:00