Michael Q Larson e9efc039ec Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp ...

Conflicts:
	views/resources/live-pair-programming.jade

2015-01-27 22:23:58 -08: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

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

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

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

full layout now works. refactor files and routes to have more conventional names and redirects where necessary

2015-01-26 11:38:19 -08:00

live-pair-programming.jade

Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp

2015-01-27 22:23:58 -08:00

nonprofit-project-instructions.jade

update the complete all the challenges flow and copy

2015-01-23 15:13:36 -08:00

pair-program-with-team-viewer.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

privacy.jade

Remove extra spaces in word

2015-01-23 07:45:47 -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

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