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

474 Commits

Author SHA1 Message Date
Blade Barringer 6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -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 074e683ba7 Change formatting of cds modal 2015-09-06 09:57:44 -05:00
Blade Barringer a44cd748af Use the user's preferred date format 2015-09-06 09:42:48 -05:00
Blade Barringer 3a8eda6c1a Remove extraneous info about last cron 2015-09-05 15:35:07 -05:00
Blade Barringer 9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer 807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Blade Barringer 047a88cef5 Merge branch 'zedutchgandalf-develop' into gulp_build 2015-09-04 16:35:45 -05:00
Blade Barringer 53a03b4396 Hide older news link in older news page 2015-09-04 16:32:05 -05:00
Blade Barringer 3e03ff124d Remove trailing blank spaces 2015-09-04 16:24:27 -05:00
Blade Barringer f7df464ebd Remove unneeded class 2015-09-04 16:24:10 -05:00
Sabe Jones 8213643485 fix(FAQ): Link from Help button 
Also swaps a couple of URLs to use HTTPS.
 2015-09-04 15:12:17 -04:00
Sabe Jones 869651f5a2 feat(FAQ): Static FAQ page 
Introduces a new static page for Frequently Asked Questions, linked from the Help menu. Fixes #5773.
 2015-09-04 15:05:15 -04:00
Robin Arys 39df743693 Change headers to use the proper ones 2015-09-04 15:52:34 +02:00
Robin Arys 345ab4bdbe Move repeated classes up one level into a div 2015-09-04 15:34:03 +02:00
Robin Arys c7dc8d551b Remove small_news_header and big_news_header CSS classes 2015-09-04 10:41:22 +02:00
Robin Arys d03acee4bc Redesign static old news page per #5836 2015-09-04 00:22:41 +02:00
Sabe Jones b5124e6cd8 fix(warnings): Show modal only once 
Also removes a random extra newline.
 2015-09-03 11:12:54 -04:00
Sabe Jones 1a675b8461 feat(warning): Revised low health modal 2015-09-02 16:31:56 -04:00
Sabe Jones e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -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 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
Sabe Jones c23312f771 feat(mystery): 2015 August items 2015-08-24 17:19:12 -04:00
Blade Barringer 427fbb959b Add join existing party button 2015-08-23 14:59:06 -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