Commit Graph

246 Commits (6ed5c5e8e0529357da622175eb22b3a181da16e5)

Author SHA1 Message Date
Michael Q Larson 6ed5c5e8e0 add git gulp and browser-sync which still is not working properly 2014-12-22 13:38:48 -08:00
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 5497987506 Merge branch 'master' into challenges
Conflicts:
	app.js
2014-12-16 10:45:59 -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 91c829ac19 revise to have both screen hero and team viewer pair programming sections 2014-12-15 21:10:13 -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 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 c72dfb32bd add chromebook promo 2014-12-11 21:24:44 -08:00
Michael Q Larson 21738654e9 start working on integrating helmet plugin 2014-12-10 20:44:33 -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 6b7ca4fe70 update landing page with we are Free Code Camp content including masonry for twitter embeds 2014-12-09 22:30:18 -08:00
Michael Q Larson 719b4e6c5f fix the FCC email login process 2014-12-07 16:25:43 -08:00
Michael Q Larson 177dc900cf made parallel 'points' infrastructure 2014-12-05 20:44:42 -08:00
Michael Q Larson 704b4e52a3 Revert "update the landing page and add the firelane easter egg"
This reverts commit 06c4ec540cf77b5d7b693a0725c37a90ca4f0fb0.
2014-12-05 11:49:21 -08:00
Michael Q Larson 4a0c724711 update the landing page and add the firelane easter egg 2014-12-05 10:31:04 -08:00
Michael Q Larson 07ba7e4fcb continue work on challengeshash 2014-12-04 12:06:17 -08:00
Michael Q Larson 5c54fddaec Merge branch 'master' into timestamp
Conflicts:
	views/partials/challenges.jade
2014-12-03 23:31:36 -08:00
Michael Q Larson 3fb11302d4 add privacy 2014-11-29 23:01:49 -08:00
Michael Q Larson 21370b83a5 start adding omniauth functionality back in and debugging in production 2014-11-29 22:22:27 -08:00
Michael Q Larson 00c92176cb update the hackathon starter base app 2014-11-29 21:32:59 -08:00
Michael Q Larson 79f060951a add jquery exercises 2014-11-29 15:16:47 -08:00
Michael Q Larson 456c845967 reached a stopping point, trying to fix a production bug 2014-11-26 22:00:28 -08:00
Michael Q Larson d973619f4a writes completed challenges to database 2014-11-25 11:17:07 -08:00
Michael Q Larson 06fe5390ba seems to attempt to write timestamp 2014-11-24 18:07:03 -08:00
Michael Q Larson d9502856dc SEO improvements suggested by Mark 2014-11-23 15:08:46 -06:00
Michael Q Larson 0f3132a3f0 maybe fix the redirect issue 2014-11-19 15:50:57 -08:00
Berkeley Martinez 7c1ae2f450 Adds auth check to linked path. Removes unused routes. 2014-11-19 15:30:36 -08:00
Michael Q Larson e85cf837cd add new relic require to app.js and fix challenges.js 2014-11-17 21:16:32 -08:00
Michael Q Larson fdff7d1691 add learn-to-code 2014-11-11 17:52:03 -08:00
Michael Q Larson 24d57f0eaf possibly prevent app from crashing 2014-11-10 10:29:16 -08:00
Sahat Yalkabov 887462f734 removed helperContext property from connect assets 2014-11-08 20:54:55 -08:00
Sahat Yalkabov 2dcea49f70 user model cleanup 2014-11-08 20:42:48 -08:00
Michael Q Larson ca0c71b77f redirects to correct challenge upon authentication 2014-11-06 23:01:01 -08:00
Michael Q Larson e36a98cf2a ajax seems to work and we now seem to track completion of challenges 2014-11-06 22:47:35 -08:00
Michael Q Larson 86d433aaba closer to getting ajax to work 2014-11-06 17:38:47 -08:00
Michael Q Larson 944f4d6a1d purge old views and now using simple numeric system 2014-11-06 16:27:18 -08:00
Michael Q Larson 80fbe1dee4 fix nonprofit form and fix some mistakes in video links 2014-11-04 14:57:00 -08:00
Michael Q Larson 97ddb9bc21 add a lot of content to challenges 2014-11-03 12:32:02 -08:00
Michael Q Larson 5a2de8c47b start grooming the challenges 2014-11-02 12:24:37 -08:00
Michael Q Larson de29af1e8a update views and add routes to app.js 2014-11-02 09:07:40 -08:00
Michael Q Larson ff5f12cda8 update views and remove additional cruft 2014-11-01 18:07:59 -07:00
Sahat Yalkabov a5e8329769 app.js cleanup, cache defaults to 1 year for maxAge 2014-10-27 19:38:52 -07:00
Michael Q Larson 029daa816f rename non-profit to nonprofit 2014-10-26 09:32:57 -07:00
Michael Q Larson 2387e00ca8 update non-profit route 2014-10-26 09:22:53 -07:00
Michael Q Larson 942b154f70 fix minor problems and use s3 2014-10-20 16:25:24 -07:00
Michael Q Larson fa76554a5b finish setting up layouts 2014-10-20 15:35:42 -07:00
Michael Q Larson 972c52ca47 add named routes to courses 2014-10-20 13:28:23 -07:00
Michael Q Larson 8f3c7b44c5 start creating partials and views 2014-10-20 12:37:48 -07:00