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

Conflicts:
	views/bonfire/bonfire.jade

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

..

api.js

Major refactor. Add error handlers everywhere.

2014-12-23 08:48:28 -08:00

bonfire.js

update the title on bonfire.js

2015-01-21 15:38:39 -08:00

challenges.js

make bonfire view consistent with other challenge views and make codemirror height larger and result code mirror pane read only with no cursor

2015-01-10 22:59:24 -08:00

contact.js

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

home.js

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

resources.js

improve bonfire and start adding model and controller

2015-01-17 18:52:58 -08:00

resources.json

Update challenges to remove SQL challenges. Make minor improvements to challenges.son

2014-12-30 22:02:19 -08:00

user.js

update the reset password functionality and make the password reset form consistent with other such forms

2015-01-12 22:02:33 -08:00