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

..

about-us.jade

update the challenges.json with more comprehensive CS101 descriptions and add line breaks for long urls and add some additional tweets

2014-12-16 16:38:33 -08:00

challenges.jade

update to automatically redirect based on highest completed challenge hash value

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

faq.jade

Merge branch 'timestamp' into challenges

2014-12-13 21:09:11 -08:00

flash.jade

updated alert messages close icon

2014-07-02 00:43:20 -04:00

footer.jade

update views and remove additional cruft

2014-11-01 18:07:59 -07:00

meta.jade

Merge branch 'master' into helmet

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

navbar.jade

conditional logic showing links to forum and chatroom

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