Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,677 Commits 64 Branches 1,256 Tags
6f85fcfde282f319a2e2c2d7d7a2e8376adba0a6
Commit Graph

666 Commits

Author SHA1 Message Date
Sabe Jones 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
Blade Barringer 41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer 1d8b10dc99 Adjust formatting 2015-08-31 20:35:23 -05:00
Blade Barringer f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer d5bd5f281c Rename file names 2015-08-31 20:21:01 -05:00
Blade Barringer c65ab56641 Remove focus-me directive 2015-08-31 20:17:30 -05:00
Blade Barringer dc5c35bb17 Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing 2015-08-31 19:01:11 -05:00
Blade Barringer 0bed76d336 Restructure test 2015-08-31 17:42:33 -05:00
TheHollidayInn 42066be2cf Fixed broken test by change element to a focusable element 2015-08-31 16:49:34 -05:00
Blade Barringer a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Blade Barringer 342343d34f Prevent user from leaving party during active quest 2015-08-28 22:41:30 -05:00
Blade Barringer 2e3c166a40 Add test for removing quest data from user 2015-08-28 21:58:00 -05:00
Sabe Jones 9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	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-08-28 13:24:10 -05:00
Sabe Jones 8d713a53c4 feat(tutorial): Splash screen overhaul complete 2015-08-28 13:58:30 -04:00
Blade Barringer 15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
TheHollidayInn 6fb29d8766 Added ability to close menu when a child element has closeMenu directive 2015-08-26 15:32:59 -05:00
Alys 049f9280a2 Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12 
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
 2015-08-26 22:01:29 +10:00
TheHollidayInn 06f59bed7c Added test for task-focus directive 2015-08-25 16:11:18 -05:00
Blade Barringer 5b583f43d6 Fix api and karma test 2015-08-24 18:07:21 -05:00
Blade Barringer 484609c634 Stub Q 2015-08-24 17:55:20 -05:00
Blade Barringer ce7d0039f8 Q-ify save functions 2015-08-24 17:36:06 -05:00
Blade Barringer f584b173c8 Add user scrub quest data back in 2015-08-24 12:58:31 -05:00
Blade Barringer 66d16fefc3 Send back 204 from questLeave route 2015-08-24 12:38:43 -05:00
Blade Barringer af20986fbc Simplify qroup service quest functions 2015-08-24 08:06:34 -05:00
Blade Barringer fbd4490dbc Fix sinon assertions 2015-08-24 07:46:37 -05:00
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 0b7e43f156 Add route for leaving active quest 2015-08-23 20:29:57 -05:00
Blade Barringer fefcbd1d2f Merge branch 'develop' into sabrecat/party-page 2015-08-22 21:42:05 -05:00
Blade Barringer f4bc208226 Reorganize karma.conf 2015-08-22 21:41:13 -05:00
Blade Barringer 99d2b7f749 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:08 -05:00
Blade Barringer b2c4d5c012 Add test for items that are deleted when getting the user 2015-08-22 17:53:49 -05:00
Blade Barringer 9ddf5353d1 Clean up directive tests 2015-08-22 17:21:30 -05:00
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
TheHollidayInn 5e510aade0 Added tests for new menu directives 2015-08-22 15:25:51 -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 0f5f80f910 Unpend preening test 2015-08-19 19:23:23 -05:00
Sabe Jones f306ee6d1d fix(test): Skip preen test 2015-08-19 20:08:39 -04:00
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -05:00
Blade Barringer 00ec16877b Merge pull request #5799 from Alys/challenges-editable-by-admins-2015-08-16 
allow Challenges to be edited, closed, and deleted by staff and moderators
 2015-08-18 17:20:19 -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 b2e90ffb16 Merge branch 'develop' into sabrecat/party-page 2015-08-18 08:10:57 -05:00
Blade Barringer be87f69cd4 Actually save copy message modal spec 2015-08-18 08:10:38 -05:00
Blade Barringer b5a7b31fa8 Merge branch 'develop' into sabrecat/party-page 2015-08-18 08:09:33 -05:00
Blade Barringer fe22f76e30 Move copy message modal controller spec to own file 2015-08-18 08:06:46 -05:00