Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,013 Commits 64 Branches 1,256 Tags
5652a47290f8f9a6b87d854b0cf17536fe1e5d4f
Commit Graph

492 Commits

Author SHA1 Message Date
Sabe Jones 35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones 009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Sabe Jones 6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons 
Front page Tweet button
 2015-09-22 17:38:47 -05:00
Sabe Jones 3e8a3ee5f4 feat(event): Fall Festival 2015 2015-09-18 15:19:59 -04:00
Sabe Jones 9be0990217 chore(news): Bailey 2015-09-16 2015-09-16 18:34:20 -04:00
Blade Barringer f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only 
Adjustments to group quest behavior
 2015-09-15 18:57:32 -05:00
Blade Barringer b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Sabe Jones 580a9871b9 chore(news): Bailey 2015/09/14 2015-09-14 21:21:22 -05:00
Blade Barringer d573f3c53d Merge branch 'melarish-Mystery_items_already_owned' into develop 2015-09-13 18:28:18 -05:00
Alys fbaa5d4321 add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme 2015-09-12 11:05:31 +10:00
Sabe Jones 6396b064d2 fix(social): Localize Tweet button 2015-09-10 18:51:19 -04:00
Sabe Jones 45c8bb06e2 Revert "feat(modals): Simplified scroll drop" 
This reverts commit 8b4d34da00.
 2015-09-10 18:08:51 -04:00
Sabe Jones c03107b54b feat(social): Twitter share main page 2015-09-10 17:54:40 -04:00
Sabe Jones e4c7870c22 WIP(social): Non-AddThis Tweet button 2015-09-10 17:31:12 -04:00
melarish 05cf144630 Pulled and merged 2015-09-09 23:23:45 +01:00
Sabe Jones 8b4d34da00 feat(modals): Simplified scroll drop 2015-09-09 14:27:34 -04:00
Sabe Jones 74cb7d7f04 chore(news): Horse Bailey 2015-09-08 14:56:49 -04:00
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
melarish b2bb6016fa Added +1 Hourglass to debug menu 2015-09-02 18:12:48 +01: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