Commit Graph

1730 Commits (5fc6fb6e49785c1f56fe3d698da31a2f17551d20)

Author SHA1 Message Date
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
Michael Q Larson 3ac4ecdd08 add twitter social functionality 2014-12-23 12:16:23 -08:00
Michael Q Larson a032be6a0b fix finished challenges button 2014-12-23 11:20:31 -08:00
Berkeley Martinez 86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson ca6652a791 refactor views to remove hardcoded challenge data 2014-12-23 08:22:50 -08:00
Michael Q Larson 3eb09ab637 start reworking challenge views 2014-12-22 21:07:50 -08:00
Michael Q Larson 7a5224b876 reverse change to challenge checkoff 2014-12-22 16:56:09 -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 b7ec61c4c3 probably fix crashing sites 2014-12-22 14:57:07 -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
Berkeley Martinez e921b637cc Add jshinrc file. 2014-12-22 14:08:46 -08:00
Berkeley Martinez 3122c6a61c Move keys into .env and remove from repo
Use keys in local .env during dev.
2014-12-22 14:06:24 -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 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