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

800 Commits

Author SHA1 Message Date
Sabe Jones 2c0d59989a feat(groups): Hide sync button when irrelevant 
Also extends the "your party chat is empty" message to have a counterpart in Guilds.
 2015-09-01 15:14:38 -04:00
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
Sabe Jones 68fef118e1 Merge pull request #5866 from HabitRPG/sabrecat/content-201509 
Content 201509
 2015-09-01 10:56:24 -05:00
Blade Barringer 41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer 3e44c3a8ce Change focus-me to use task-focus 2015-08-31 20:16:14 -05:00
Blade Barringer 499e8578cd Merge branch 'TheHollidayInn-menu-fix-notification-menu-closing' into develop 2015-08-31 19:02:32 -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 ca49412313 Use === instead of == 2015-08-31 18:59:01 -05:00
Blade Barringer dfaaed05a4 Switch double quotes to single quotes 2015-08-31 18:54:06 -05:00
Sabe Jones 5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Sabe Jones 3ead359538 chore(news): August Last Chance Bailey 2015-08-30 21:06:25 -05:00
Blade Barringer ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer 8cb11aa85d Remove merge conflict marking 2015-08-29 07:18:17 -05:00
Blade Barringer a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Blade Barringer 4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer dd1e69b9d5 Merge branch 'RossBrunton-develop' into develop 2015-08-28 21:42:16 -05:00
Blade Barringer df3c498fcc Add rasterize class 2015-08-28 21:41:53 -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
Sabe Jones f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Sabe Jones c4012ad762 WIP(tutorial): New intro splash 2015-08-27 16:04:59 -04:00
TheHollidayInn 6fb29d8766 Added ability to close menu when a child element has closeMenu directive 2015-08-26 15:32:59 -05:00
Sabe Jones 6564cb52dc fix(news): wording tweak 2015-08-25 13:10:33 -04:00
Blade Barringer ce7d0039f8 Q-ify save functions 2015-08-24 17:36:06 -05:00
Sabe Jones c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Blade Barringer 66d16fefc3 Send back 204 from questLeave route 2015-08-24 12:38:43 -05:00
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 6955add15d Use locale string 2015-08-23 15:05:49 -05:00
Blade Barringer 427fbb959b Add join existing party button 2015-08-23 14:59:06 -05:00
Blade Barringer 63315ce281 Remove extra ng-if 2015-08-23 10:23:41 -05:00
Blade Barringer 12137428e9 Show loading new party message when creating a solo party 2015-08-23 10:17:48 -05:00
Blade Barringer 1144defbca Restructure party page 2015-08-23 10:15:00 -05:00
Blade Barringer 74bef58537 Simplify text-centering 2015-08-23 09:32:59 -05:00
Blade Barringer 08edcb6743 Move loading new party to own partial 2015-08-23 09:31:46 -05:00
Blade Barringer 963b136a91 Reorg party views 2015-08-23 09:28:45 -05:00
Blade Barringer a36c08930e Separate out party sections 2015-08-23 09:24:55 -05:00
Blade Barringer 3f874e25a4 Fix bug where booting a member makes them appear in the other members list 2015-08-23 09:07:18 -05:00
Blade Barringer ccff3998bd Hide quest button if quest is pending or active 2015-08-23 08:42:15 -05:00
Blade Barringer e6fb8f34bb Add user id to solo party page 2015-08-23 08:34:33 -05:00
Blade Barringer fd35f58ccd Display invite party to quest only if party has more than one member 2015-08-23 08:29:45 -05:00
Blade Barringer 59a2d2b2f0 Improve quest modal appearance 2015-08-23 08:22:34 -05:00
Blade Barringer fefcbd1d2f Merge branch 'develop' into sabrecat/party-page 2015-08-22 21:42:05 -05:00
Alys 5b8c161932 changed habitrpg.wikia.com to habitica.wikia.com 2015-08-23 12:31:10 +10:00
Blade Barringer 99d2b7f749 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:08 -05:00
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Blade Barringer e4eae7a23b Move ian inside quest scrolls div 2015-08-22 15:43:35 -05:00
Blade Barringer a6c5fab8a7 Correct quest display bug 2015-08-22 15:36:29 -05:00
Blade Barringer bbb878d983 Remove uncessary divs 2015-08-22 14:26:17 -05:00