Commit Graph

367 Commits (5fc6fb6e49785c1f56fe3d698da31a2f17551d20)

Author SHA1 Message Date
Michael Q Larson 8c9a533758 fix a couple minor issues with the user controller serving the public profile views 2015-01-08 23:33:17 -08:00
Michael Q Larson 9ab523d3f3 Merge branch 'master' into profiles 2015-01-08 22:33:17 -08:00
Michael Q Larson 063f1f3bb2 finish initial public profiles 2015-01-08 22:31:15 -08:00
Michael Q Larson bfe75a180d improve the profile layout and start building the public profile view 2015-01-08 18:39:16 -08:00
Michael Q Larson f9337c57ea update profile edit view 2015-01-07 16:10:40 -08:00
Michael Q Larson 3f83f56acc simplify stats page to reduce queries 2015-01-07 10:50:48 -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
terakilobyte 41a1bc37c3 Hooking up Angular to Profile.jade 2015-01-06 00:52:30 -05:00
Michael Q Larson be22449d25 continue work on angular form 2015-01-05 20:09:23 -08:00
Michael Q Larson 41abdae46f further progress on the form and add angular inline 2015-01-05 17:29:37 -08:00
Michael Q Larson db9622a2e5 public profile accessible and start updating form 2015-01-05 16:38:56 -08:00
Michael Q Larson f243367774 Remove noisy logs, add new camp counselors and add github auth back in 2015-01-04 12:26:45 -08:00
Michael Q Larson 89858f6604 fix an error introduced when the contact.js controller was refactored 2014-12-31 09:57:48 -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 8fd648b175 remove unnecessary variable declaration 2014-12-30 20:44:35 -08:00
Michael Q Larson d70bea506a update the navigation to have publicly available menu items 2014-12-30 20:26:12 -08:00
Michael Q Larson 8a9905becf this works, but does not work until I restart the server for some reason 2014-12-30 16:26:25 -08:00
Michael Q Larson 99ebcdd2be fix the pair program with team viewer view 2014-12-26 12:15:24 -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
Michael Q Larson 986d6020fa add CTA buttons to anonymous challenge completion modal and selectively hide and show elements on the show view 2014-12-24 14:34:52 -08:00
Michael Q Larson d39804053c finished with profile page for now 2014-12-24 00:07:20 -08:00
Michael Q Larson 6906de7146 update jquery exercises 2014-12-23 23:23:37 -08:00
Michael Q Larson fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -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
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 2245aa6818 update the api controller 2014-12-22 14:33:25 -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 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 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 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 2777259af9 attempt to add new user mailer 2014-12-07 20:50:53 -08:00
Michael Q Larson 719b4e6c5f fix the FCC email login process 2014-12-07 16:25:43 -08:00
Michael Q Larson bedddde945 make the profile page look better 2014-12-05 23:10:02 -08:00
Michael Q Larson 177dc900cf made parallel 'points' infrastructure 2014-12-05 20:44:42 -08:00
Michael Q Larson 5fb1cbf217 update usability 2014-12-05 11:58:39 -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