Michael Q Larson 3810b4d9ae Merge branch 'master' into bonfire-improvement ...

Conflicts:
	views/bonfire/bonfire.jade

2015-01-21 15:42:08 -08:00

..

account

fix the angular validation Jade that was mangled by my IDE the first time

2015-01-15 15:45:24 -08:00

bonfire

Merge branch 'master' into bonfire-improvement

2015-01-21 15:42:08 -08:00

challenges

work with @brndnb to improve usability of completion modals and write client-side jquery to prevent post if user isn't authenticated, which fixes a javascript error we were experiencing on serverside

2015-01-18 13:36:24 -08:00

contact

Add email functionality to done-with-first-100-hours page and refactor nonprofit link to be on same controller in same view folder

2015-01-14 13:28:20 -08:00

partials

get a better info footer icon

2015-01-21 15:36:07 -08:00

resources

update twitch.tv link

2015-01-20 20:28:01 -08:00

home.jade

make Mark Howard's SEO changes, make navbar look better, hide footer on landing page, update meta tags'

2015-01-21 14:12:19 -08:00

layout.jade

specify that we're using English in the layout file and state the npm and node version in package.json'

2015-01-21 14:29:16 -08:00