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

452 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
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
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Blade Barringer 950fab237d Correct invite users to guild 2015-08-22 12:52:21 -05:00
Blade Barringer 63b492ab51 Merge branch 'develop' into sabrecat/party-page 2015-08-22 12:44:07 -05:00
Blade Barringer 60a36ca6fc Correct view 2015-08-22 08:18:39 -05:00
Blade Barringer 53531ae296 Add btn-block class 2015-08-22 07:42:15 -05:00
Blade Barringer d55da12c01 Hide + button on invite by uuid tab 2015-08-22 07:41:54 -05:00
Blade Barringer 3153fbac3c Fix bug where mutliple user ids could not be saved 2015-08-21 08:19:39 -05:00
Alys f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Alys 28e360d7f4 change Janet Janet Mongilio to janetmango 2015-08-20 11:23:29 +10:00
Sabe Jones 99c8f941e6 chore(news): August pet Bailey 2015-08-19 17:39:11 -04:00
TheHollidayInn e762a51e4c Moved menu expand directive and created menu close directive 2015-08-19 08:53:51 -05:00
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -05:00
Blade Barringer fa7f957ccc Update habitrpg.com to habitica.com where applicable 2015-08-19 08:00:34 -05:00
Blade Barringer 1fecc7dc89 Change wiki links to habitica 2015-08-19 07:46:25 -05:00
Blade Barringer 14ae3b1046 Add one time binding 2015-08-17 22:07:09 -05:00
Blade Barringer ba2988ac98 Use new content for mixin 2015-08-17 21:51:08 -05:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys 8c186f3068 add close button audio menu on mobile web view - fixes https://github.com/HabitRPG/habitrpg/issues/5359 2015-08-15 15:21:17 +10:00