Michael Q Larson 70f812dc78 Merge branch 'master' into ux-improvements ...

Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	views/bonfire/show.jade

2015-03-29 13:05:39 -07:00

..

chat.jade

update the stories view to have ghost discuss button and update chat instructions

2015-03-09 22:10:09 -07:00

chromebook.jade

fix a typo in the challenges, add a note about the navigation links to the chat room and forchallenges, and revert the jumbotrons to falling after the navbar instead of being tucked under it - @rybar recommended this but it really bugs me. We can discuss further later

2015-01-01 23:45:39 -08:00

control-shortcuts.jade

fix a typo in the challenges, add a note about the navigation links to the chat room and forchallenges, and revert the jumbotrons to falling after the navbar instead of being tucked under it - @rybar recommended this but it really bugs me. We can discuss further later

2015-01-01 23:45:39 -08:00

deploy-a-website.jade

add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces

2015-03-08 01:36:09 -08:00

gmail-shortcuts.jade

fix a typo in the challenges, add a note about the navigation links to the chat room and forchallenges, and revert the jumbotrons to falling after the navbar instead of being tucked under it - @rybar recommended this but it really bugs me. We can discuss further later

2015-01-01 23:45:39 -08:00

guide-to-our-nonprofit-projects.jade

update nonprofit project guide copy

2015-03-18 16:01:21 -07:00

install-screenhero.jade

add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces

2015-03-08 01:36:09 -08:00

javascript-in-your-inbox.jade

fix a typo in the challenges, add a note about the navigation links to the chat room and forchallenges, and revert the jumbotrons to falling after the navbar instead of being tucked under it - @rybar recommended this but it really bugs me. We can discuss further later

2015-01-01 23:45:39 -08:00

jquery-exercises.jade

fix a jquery exercise regression and make jquery exercises run in firefox

2015-01-23 00:30:34 -08:00

learn-to-code.jade

Merge branch 'master' into ux-improvements

2015-03-29 13:05:39 -07:00

live-pair-programming.jade

add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces

2015-03-08 01:36:09 -08:00

nodeschool-challenges.jade

update link to nodeschool challenges video

2015-03-19 23:09:50 -07:00

nonprofit-project-instructions.jade

add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces

2015-03-08 01:36:09 -08:00

privacy.jade

add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces

2015-03-08 01:36:09 -08:00

programmer-interview-questions-app.jade

Clean up views, remove API controller views, add the gmail-shortcuts, control-shortcuts and deploy-a-website static views. Move all resource controller views to a resources view folder and update routes

2014-12-26 00:05:00 -08:00

sitemap.jade

refactor announcement modal and add nodeschool-challenges

2015-03-19 22:34:36 -07:00

stats.jade

update about page and move stats into partial that is also displayed on about page. Fix Trello API issue on stats page

2015-01-06 23:08:54 -08:00