Commit Graph

44 Commits (d7d4727c0f7acb7122769faf5b51be05677b1447)

Author SHA1 Message Date
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
Michael Q Larson 3b0c082b56 update live-pair-programming page
;
2015-01-27 17:17:21 -08:00
Michael Q Larson f8343d4c13 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
Michael Q Larson 48e535b9c5 now have both full width layout and normal layout 2015-01-26 11:02:22 -08:00
Michael Q Larson 34f106387d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-24 11:28:48 -08:00
Michael Q Larson d690f976f3 update the complete all the challenges flow and copy 2015-01-23 15:13:36 -08:00
Jason Rueckert 37daf55719 Remove extra spaces in word 2015-01-23 07:45:47 -08:00
Michael Q Larson 1f6cb10a32 fix a jquery exercise regression and make jquery exercises run in firefox 2015-01-23 00:30:34 -08:00
Michael Q Larson 1a9beef081 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	views/resources/live-pair-programming.jade
2015-01-22 16:53:49 -08:00
Michael Q Larson 95f5581d19 improve the live code view 2015-01-22 16:52:43 -08:00
Jason Rueckert 54470e6c46 added past events 2015-01-22 16:00:26 -08:00
Michael Q Larson 129000a986 minor refactor of jquery exercises. Still not working in firefox 2015-01-22 13:32:00 -08:00
Michael Q Larson 20cc2aa1b7 remove container from live-pair-programming view so more horizontal real-estate for twitch 2015-01-22 11:29:45 -08:00
Michael Q Larson da0180e7eb update twitch.tv link 2015-01-20 20:28:01 -08:00
Michael Q Larson 92a8107fcd add twitch to footer and update the live pair programming page 2015-01-20 20:05:23 -08:00
Michael Q Larson 9e3f5eadc6 update live code 2015-01-20 18:17:25 -08:00
Michael Q Larson 38de94138d update live-pair-programming 2015-01-20 18:14:35 -08:00
Michael Q Larson 044f89b8cc add footer 2015-01-17 14:16:29 -08:00
Michael Q Larson 279df2995c change about path to learn-to-code for SEO purposes and remove learn-to-code view and controller action 2015-01-17 11:27:27 -08:00
Michael Q Larson a3f3463546 add links below youtube videos to get around youtube embed issue 2015-01-15 19:05:31 -08:00
Michael Q Larson 13faedc86e 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
Michael Q Larson 89357f3d13 add twitch channel to live pair programming page 2015-01-14 13:26:36 -08:00
Michael Q Larson 19c39f9fee update live pair programming 2015-01-13 18:37:17 -08:00
Michael Q Larson b43e4094fe change live code video 2015-01-13 18:26:30 -08:00
Michael Q Larson da9d2bd6d3 live code 2015-01-13 18:13:56 -08:00
Michael Q Larson 42f7d3875c update live coding page 2015-01-13 17:26:16 -08:00
Michael Q Larson b858fdbe6a update link for live pair programming 2015-01-13 10:31:16 -08:00
Free Code Camp f55b341380 Merge pull request #21 from brndnb/patch-2
Edit wording of jquery exercises
2015-01-12 22:12:42 -08:00
Michael Q Larson 4bdc3d34ad Add blogger API to FCC and list 5 most recent blog posts on about page 2015-01-12 21:28:58 -08:00
Branden Byers d2ef354f60 Edit wording of jquery exercises
Removed 'the' from some of the questions for consistency. The rule applied: either use "the <target> element" or only "<target>" when not following with "element." Alternatively, instead of removing "the," you could instead add "element" to the end of each reference to a target. But as it was, the wording was inconsistent.

Also removed extra "from."
2015-01-12 13:29:41 -06:00
Michael Q Larson 74b9965627 update pair programming page 2015-01-07 11:55:14 -08:00
Michael Q Larson 91638ade81 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
Michael Q Larson 574cb3d957 update live-pair-programming.jade 2015-01-06 16:25:55 -08:00
Michael Q Larson 9350fff6d5 minor fix to challenges and jquery-exercises answer 2015-01-06 12:01:52 -08:00
Michael Q Larson ba800ee54b Fix spacing between elements on landing page and interior - specificially alter the top padding on the body globally 2015-01-04 12:18:55 -08:00
Michael Q Larson 62e07db09a 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
Michael Q Larson 71d4e10a28 add latest live pair video 2014-12-30 23:29:08 -08:00
Michael Q Larson a00070e5c5 fix a strange bug caused by an apparent clash in variables introduced this morning by my menu refactor 2014-12-30 22:03:03 -08:00
Michael Q Larson 1dda38eaaa Update challenges to remove SQL challenges. Make minor improvements to challenges.son 2014-12-30 22:02:19 -08:00
Michael Q Larson 3b7c34d442 update live-pair-programming view and whitelist youtube 2014-12-29 22:56:53 -08:00
Michael Q Larson 7042680645 update paths to compressed images and update copy on stats page 2014-12-28 11:37:19 -08:00
Michael Q Larson 9174525cc9 update video link 2014-12-26 19:16:19 -08:00
Michael Q Larson eb29b6e5f4 fix bad link on stats page 2014-12-26 00:13:58 -08:00
Michael Q Larson a5fa27466c 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