Commit Graph

491 Commits

Author SHA1 Message Date
Nathan Leniz
6ea5f5c895 Preparing for bonfire challenges, create Bonfire model, BonfireCompletion model, update bonfire controller, create initial bonfire seed data 2015-01-21 21:32:13 -05:00
Michael Q Larson
3810b4d9ae Merge branch 'master' into bonfire-improvement
Conflicts:
	views/bonfire/bonfire.jade
2015-01-21 15:42:08 -08:00
Michael Q Larson
b1f22ef925 update the title on bonfire.js 2015-01-21 15:38:39 -08:00
Michael Q Larson
6202c03d13 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	controllers/bonfire.js
2015-01-21 15:37:14 -08:00
Nathan Leniz
c422f9474b More improvements, keyboard shortcuts working again, extra protection against fatal errors 2015-01-21 17:17:45 -05:00
Michael Q Larson
e5a407eacd make Mark Howard's SEO changes, make navbar look better, hide footer on landing page, update meta tags' 2015-01-21 14:12:19 -08:00
jmcshane
03d635c65f Test evaluation complete, need to hook pre-submit 2015-01-20 23:31:36 -05:00
Michael Q Larson
1e427d723c fix bug that was crashing heroku 2015-01-17 19:07:57 -08:00
Michael Q Larson
bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -08:00
Michael Q Larson
7722c20877 Merge branch 'twitter-auth' of https://github.com/FreeCodeCamp/freecodecamp into one-column-challenges
Conflicts:
	app.js
2015-01-17 17:46:12 -08:00
Michael Q Larson
279df2995c change about path to learn-to-code for SEO purposes and remove learn-to-code view and controller action 2015-01-17 11:27:27 -08:00
webdev
adac5f6352 Work on bonfire and make better .jshintrc files 2015-01-16 18:58:27 -05:00
Michael Q Larson
13faedc86e Add email functionality to done-with-first-100-hours page and refactor nonprofit link to be on same controller in same view folder 2015-01-14 13:28:20 -08:00
Michael Q Larson
26c3f265ad update the reset password functionality and make the password reset form consistent with other such forms 2015-01-12 22:02:33 -08:00
Michael Q Larson
3afd05ad85 Merge branch 'passreset' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-12 21:36:38 -08:00
terakilobyte
5765c18def Re-enabling password reset for email signups 2015-01-13 00:35:11 -05:00
Michael Q Larson
4bdc3d34ad Add blogger API to FCC and list 5 most recent blog posts on about page 2015-01-12 21:28:58 -08:00
Michael Q Larson
d8929ac72d make bonfire view consistent with other challenge views and make codemirror height larger and result code mirror pane read only with no cursor 2015-01-10 22:59:24 -08:00
terakilobyte
407f2212d0 Smoke rises 2015-01-11 00:45:37 -05:00
terakilobyte
b4395e2b59 Cleaning up, enforcing username constraints to match profile page settings. Added uniqueness to profile username. 2015-01-09 22:05:45 -05:00
terakilobyte
11bc776ffb Email signup for angularized, user.js controller modified so that username can be stored upon signup 2015-01-09 21:33:50 -05:00
Michael Q Larson
02eb3b5914 committing what I have for Nathan to continue 2015-01-09 18:09:49 -08:00
Michael Q Larson
3e7da5ae98 start angularizing sign up form 2015-01-09 17:52:19 -08:00
Michael Q Larson
4e91e94463 fix firefox CDN issue and ensure twitter handle, email and username are lowercase 2015-01-09 15:10:34 -08:00
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