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
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
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
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
aad3e5ade6
fix(sharing): Add social service to Inventory
...
Also fixes accidental 'only' in tests.
2015-10-28 16:52:07 -04:00
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
c462e65942
typo
2015-10-04 13:34:51 +01:00
be3decf859
Merge branch 'develop' into refactor-content
2015-10-01 21:20:04 -05:00
bfca612be2
Moved intial filtering to a scope function and added test
2015-09-24 16:39:53 -05:00
955c163544
Merge branch 'develop' into refactor-content
2015-09-23 07:52:36 -05:00
389b5b370a
feat(pets): Magic Hatching Potions WIP
2015-09-21 17:12:23 -04:00
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
ca6137a24e
Remove unneeded file
2015-09-19 09:11:51 -05:00
91a0e0452e
added match for askQuestion
2015-09-19 01:12:30 +03:00
8881dbc034
Remove uneeded blank spaces
2015-09-16 20:01:42 -05:00
15cddabd80
fix(test): Remove only
2015-09-16 19:21:05 -04:00
f8db8f597a
refactor(test): Give user mystery items
...
...instead of stubbing out timeTravelerStore
2015-09-16 19:16:21 -04:00
98cd8364c6
feat(hourglass): Individual filter functions
2015-09-16 16:35:04 -04:00
2bde07fa1c
fix(test): Call hasAll correctly
2015-09-16 16:12:29 -04:00
7cc29810f3
fix(test): inject Content
...
Also refactors to remove lodash where it's overkill.
2015-09-16 16:01:13 -04:00
3bfeb15715
test(hourglass): TDD for Time Travel filtering
2015-09-16 15:27:19 -04:00
78fe1073d4
Add user sync to sendAction
2015-09-15 16:39:08 -05:00
b32e521c56
Pull in client side changes for quest routes
2015-09-15 09:35:17 -05:00
5553d74334
Create method to calculate whether or not user has attained all mystery equipment
2015-09-13 16:26:29 -05:00
50b709045d
Remove only from test
2015-09-13 16:24:46 -05:00
5e9b74a2b9
Add test for addHourglass
2015-09-13 10:01:14 -05:00
7e97b73e8b
Add test for addTenGems
2015-09-13 09:59:46 -05:00
edbdab5912
Add test shells for debug mode functions
2015-09-13 09:47:34 -05:00
4177202cee
Merge pull request #5855 from HabitRPG/sabrecat/party-page
...
Party Page Revamp
2015-09-06 13:28:14 -05:00
f1224bc6be
Use select instead of an input for cds
2015-09-06 09:36:29 -05:00
9ce6144fa4
Adjustments to custom day start
2015-09-05 15:32:49 -05:00
c141ee6d1c
Fix test
2015-09-05 08:14:55 -05:00
6f85fcfde2
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-09-01 13:40:20 -05:00
41c38c6e63
Merge branch 'TheHollidayInn-directives-test-task-focus' into develop
2015-08-31 20:36:07 -05:00
1d8b10dc99
Adjust formatting
2015-08-31 20:35:23 -05:00
f4ca8bb78d
Rename task-focus focus-element
2015-08-31 20:31:03 -05:00
d5bd5f281c
Rename file names
2015-08-31 20:21:01 -05:00
c65ab56641
Remove focus-me directive
2015-08-31 20:17:30 -05:00
dc5c35bb17
Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing
2015-08-31 19:01:11 -05:00
0bed76d336
Restructure test
2015-08-31 17:42:33 -05:00
42066be2cf
Fixed broken test by change element to a focusable element
2015-08-31 16:49:34 -05:00
a0040d736f
Merge branch 'develop' into sabrecat/party-page
2015-08-28 23:06:00 -05:00
8d713a53c4
feat(tutorial): Splash screen overhaul complete
2015-08-28 13:58:30 -04:00
6fb29d8766
Added ability to close menu when a child element has closeMenu directive
2015-08-26 15:32:59 -05:00
06f59bed7c
Added test for task-focus directive
2015-08-25 16:11:18 -05:00
5b583f43d6
Fix api and karma test
2015-08-24 18:07:21 -05:00
af20986fbc
Simplify qroup service quest functions
2015-08-24 08:06:34 -05:00
fbd4490dbc
Fix sinon assertions
2015-08-24 07:46:37 -05:00
bc24fa8130
Add front end button to leave quest
2015-08-23 22:38:55 -05:00
fefcbd1d2f
Merge branch 'develop' into sabrecat/party-page
2015-08-22 21:42:05 -05:00
Sabe Jones