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

1296 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 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 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
Blade Barringer 8e2247ab3e Remove extraneous white space 2015-08-31 17:28:47 -05:00
Sabe Jones 5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Kevin Gisi 69782b5bd1 Fixed the wrong redirect 2015-08-31 17:59:19 -04:00
Kevin Gisi 177c48820c Domain redirects -> 301 2015-08-31 17:34:18 -04:00
Sabe Jones 3ead359538 chore(news): August Last Chance Bailey 2015-08-30 21:06:25 -05:00
TheHollidayInn 1624fc4417 Adjusted var declration technique 2015-08-30 20:39:21 -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 fcf187fb47 Remove logic for removing quest info 2015-08-28 22:55:02 -05:00
Blade Barringer 29c7dd3e77 Merge branch 'sabrecat/party-page' of github.com:HabitRPG/habitrpg into sabrecat/party-page 2015-08-28 22:41:50 -05:00
Blade Barringer 342343d34f Prevent user from leaving party during active quest 2015-08-28 22:41:30 -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 5e8894a0a6 fix(groups): Show specific invite modal 2015-08-28 16:48:39 -04:00
Sabe Jones 3ad95e1ab7 fix(tutorial): Unstick Justin head 
Fixes #5497.
 2015-08-28 16:12:45 -04: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
Ross Brunton 821d562998 Set image-rendering to pixelated 
Closes #5846

I explictly disabled it on img because most things that use the img tag
tend not to be pixel art.
 2015-08-27 19:17:42 +01: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 2a8529012b feat(tutorial): GP and EXP awards 2015-08-25 17:09:51 -04:00
Sabe Jones 0c0525640c Merge branch 'develop' into sabrecat/onboarding-tweaks 2015-08-25 16:47:46 -04:00
Sabe Jones 6564cb52dc fix(news): wording tweak 2015-08-25 13:10:33 -04:00
Alys bbcb9e6063 fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later 2015-08-25 19:23:25 +10: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
Sabe Jones 23259cd456 WIP(tutorial): Award GP and XP 2015-08-24 16:02:25 -04: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 928a54911a Return promises in groups service 2015-08-24 07:47:01 -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 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 3098c7d460 Refactor invite 2015-08-23 14:47:10 -05:00