Commit Graph

1653 Commits (74b77ff58c0948f539cc524ef52c69df4503731d)

Author SHA1 Message Date
Michael Q Larson 9849acd49e fixed helmet related errors 2014-12-22 12:36:45 -08:00
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
Michael Q Larson c06b8683c9 remove github auth again until I can figure out the issue 2014-12-22 10:22:04 -08:00
Michael Q Larson 14174ee453 conditional logic showing links to forum and chatroom 2014-12-21 17:52:17 -08:00
Michael Q Larson 46f217f548 update navigation to include links to chatroom and forum. 2014-12-21 15:43:07 -08:00
Michael Q Larson 860171d5a5 update meta files and make landing page look better with Retina 2014-12-20 22:15:50 -08:00
Michael Q Larson fd0250884b fix landing page images 2014-12-18 00:45:31 -08:00
Michael Q Larson a7dc7d4c5a minor improvements to hamburger 2014-12-17 23:59:28 -08:00
Michael Q Larson cead8d3d81 update the seed task to delete existing challenges first 2014-12-17 14:22:23 -08:00
Michael Q Larson bb64f5f2b5 minor updates to nonprofit page 2014-12-17 10:22:59 -08:00
Michael Q Larson 2c9fe6ea5a update link 2014-12-16 18:36:00 -08:00
Michael Q Larson c302c73ec1 update live-pair 2014-12-16 17:59:57 -08:00
Michael Q Larson 7149a5985c update sitemap 2014-12-16 17:07:07 -08:00
Michael Q Larson 22bfe0dec1 fix a console error related to trying to use font weight 500 2014-12-16 16:44:03 -08:00
Michael Q Larson 6aac48951e 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
Michael Q Larson 0fb55fd9ff update challenges.json 2014-12-16 12:38:27 -08:00
Michael Q Larson 5497987506 Merge branch 'master' into challenges
Conflicts:
	app.js
2014-12-16 10:45:59 -08:00
Michael Q Larson 7dc1b2fc9b update profile page 2014-12-16 10:45:00 -08:00
Michael Q Larson 059fe5f39b update to automatically redirect based on highest completed challenge hash value 2014-12-16 10:31:19 -08:00
Michael Q Larson e8d8b90461 update challenges 2014-12-16 09:55:52 -08:00
Michael Q Larson 1d485f1b33 update challenge copy 2014-12-16 09:06:20 -08:00
Michael Q Larson c8944884f1 make some changes to copy 2014-12-15 22:11:13 -08:00
Michael Q Larson 91c829ac19 revise to have both screen hero and team viewer pair programming sections 2014-12-15 21:10:13 -08:00
Michael Q Larson ab1845cd03 update challenge.json 2014-12-15 20:14:31 -08:00
Michael Q Larson 80582b70bd make more updates to challenges and view 2014-12-15 14:17:20 -08:00
Michael Q Larson b4914fa497 small copy update to pair programming page 2014-12-14 22:26:29 -08:00
Michael Q Larson 666953d127 add the livecode and inbox.js routes and stand in text 2014-12-14 22:24:54 -08:00
Michael Q Larson 782218f020 update partials and data 2014-12-14 22:01:57 -08:00
Michael Q Larson 1d56a2572a tweaked challenges 2014-12-14 09:01:37 -08:00
Michael Q Larson c7a5a51c8d Merge branch 'timestamp' into challenges
Conflicts:
	config/passport.js
	public/css/main.less
2014-12-13 21:09:11 -08:00
Michael Q Larson 675b0ebd47 continue work on challenges 2014-12-13 21:07:33 -08:00
Michael Q Larson 9a5b94b943 Merge branch 'master' into challenges 2014-12-13 15:15:51 -08:00
Michael Q Larson a73e0f0027 add angular challenges and standin video 2014-12-13 14:23:13 -08:00
Michael Q Larson 3bfc37c127 make significant progress on documentation for new challenges 2014-12-12 13:17:28 -08:00
Michael Q Larson f984d335f8 update landing page to remove gitter 2014-12-12 09:40:57 -08:00
Michael Q Larson d38e31d065 update the chromebook raffle page 2014-12-11 23:07:33 -08:00
Michael Q Larson c72dfb32bd add chromebook promo 2014-12-11 21:24:44 -08:00
Michael Q Larson de0d77d4e8 continue work on challenges 2014-12-11 20:44:21 -08:00
Michael Q Larson 5de070aca4 more changes recommended by Ryan 2014-12-11 17:59:01 -08:00
Michael Q Larson a7658d68b0 start working on challenge notes 2014-12-11 17:50:53 -08:00
Michael Q Larson 5db002570d update colors per Rybar suggestions 2014-12-11 15:36:46 -08:00
Michael Q Larson 8741dd098a code to verify our website for pintrest 2014-12-11 12:06:00 -08:00
Michael Q Larson e05132842b radically simplify the challenge show view and remove the animation 2014-12-10 22:41:37 -08:00
Michael Q Larson b29ba117a3 increase size of advance buttons on challenge page 2014-12-10 22:26:09 -08:00
Michael Q Larson 21738654e9 start working on integrating helmet plugin 2014-12-10 20:44:33 -08:00
Michael Q Larson e174972cbb update font weight on landing page and buttons 2014-12-10 13:32:00 -08:00
Michael Q Larson d5fa19779b Revert "change font weight on landing page and buttons"
This reverts commit eba969af992288133fe898fbb26212474729273b.
2014-12-10 13:28:38 -08:00
Michael Q Larson 38715b9dfc change font weight on landing page and buttons 2014-12-10 13:11:16 -08:00
Michael Q Larson 3c7a2794a2 update Nathan's bio 2014-12-10 09:09:39 -08:00
Michael Q Larson be8f6a2551 get rid of duplicate tweet 2014-12-09 23:28:21 -08:00