Commit Graph

267 Commits (74b77ff58c0948f539cc524ef52c69df4503731d)

Author SHA1 Message Date
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
Michael Q Larson fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
Berkeley Martinez a5df9697e9 Remote route end point in auth that are not called 2014-12-23 13:50:14 -08:00
Michael Q Larson b4be1f859f minor random post-merge fixes 2014-12-23 13:30:20 -08:00
Michael Q Larson ef2eba7b14 Merge branch 'master' into refactor
Conflicts:
	app.js
	controllers/api.js
	controllers/challenges.js
	gulpfile.js
2014-12-23 12:34:09 -08:00
Berkeley Martinez 86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson 3eb09ab637 start reworking challenge views 2014-12-22 21:07:50 -08:00
Michael Q Larson 33324fdf01 attempt to fix raffle 2014-12-22 16:47:02 -08:00
Michael Q Larson aebb9b3efd may have fixed websockets whitelisting issue 2014-12-22 16:16:10 -08:00
Michael Q Larson ae9c61fc64 another attempt at fixing 2014-12-22 15:54:43 -08:00
Michael Q Larson d8158041de another fix for rafflecopter 2014-12-22 15:46:12 -08:00
Michael Q Larson b18020518b another attempt at fixing rafflecopter 2014-12-22 15:45:03 -08:00
Michael Q Larson dafae0b06c make show views work without authenticated user 2014-12-22 15:42:39 -08:00
Michael Q Larson ebf85277be another attempt by whitelisting FCC websockets itself 2014-12-22 15:37:46 -08:00
Michael Q Larson 4c9dcfdae6 yet another attempt at fixing websockets 2014-12-22 15:35:38 -08:00
Michael Q Larson f658dca068 third attempt at fixing web sockets for rafflecopter 2014-12-22 15:33:33 -08:00
Michael Q Larson bf0c6fa4d6 second attempt at fixing rafflecopter 2014-12-22 15:30:38 -08:00
Michael Q Larson 4066872b8d add rafflecopter to whitelist 2014-12-22 15:07:32 -08:00
Michael Q Larson 2d9c0d9900 add link to photo 2014-12-22 15:02:41 -08:00
Michael Q Larson 2245aa6818 update the api controller 2014-12-22 14:33:25 -08:00
Michael Q Larson d3b56989c4 comment new relic 2014-12-22 14:26:02 -08:00
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