Michael Q Larson ffddd86022 Merge branch 'master' into helmet ...

Conflicts:
	controllers/resources.js
	package.json
	views/partials/meta.jade

2014-12-22 11:49:51 -08:00

..

account

remove github auth again until I can figure out the issue

2014-12-22 10:22:04 -08:00

api

Changed YUI / Node tutorial URL, the previous link is broken

2014-11-13 07:10:42 -05:00

challenges

conditional logic showing links to forum and chatroom

2014-12-21 17:52:17 -08:00

partials

Merge branch 'master' into helmet

2014-12-22 11:49:51 -08:00

about.jade

update to automatically redirect based on highest completed challenge hash value

2014-12-16 10:31:19 -08:00

chromebook.jade

update the chromebook raffle page

2014-12-11 23:07:33 -08:00

contact.jade

minor updates to nonprofit page

2014-12-17 10:22:59 -08:00

done-with-first-100-hours.jade

update to automatically redirect based on highest completed challenge hash value

2014-12-16 10:31:19 -08:00

home.jade

update meta files and make landing page look better with Retina

2014-12-20 22:15:50 -08:00

javascript-in-your-inbox.jade

add the livecode and inbox.js routes and stand in text

2014-12-14 22:24:54 -08:00

jquery-exercises.jade

fix jquery exercises bug

2014-12-01 18:24:13 -08:00

layout.jade

update meta files and make landing page look better with Retina

2014-12-20 22:15:50 -08:00

learn-to-code.jade

add learn-to-code

2014-11-11 17:52:03 -08:00

live-pair-programming.jade

update navigation to include links to chatroom and forum.

2014-12-21 15:43:07 -08:00

pair-program-with-team-viewer.jade

revise to have both screen hero and team viewer pair programming sections

2014-12-15 21:10:13 -08:00

privacy.jade

fix typo on privacy page

2014-12-01 18:36:43 -08:00

programmer-interview-questions-app.jade

add chromebook promo

2014-12-11 21:24:44 -08:00