greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,444 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

573 Commits (8a357dd48a5e77127e85c76e492d58a13299ab44)

Author SHA1 Message Date
Nathan Leniz 68ad6f9831 Added in debug statements to diagnose problem in production 2015-02-14 21:55:24 -05:00
Nathan Leniz d66f6bebf5 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-14 21:49:04 -05:00
Nathan Leniz 4f6a6bd8f0 Clean up username validation in bonfires and remove red border from input field if user deletes all input 2015-02-14 21:48:48 -05:00
Michael Q Larson a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Michael Q Larson bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08:00
Michael Q Larson 43da6d16ff fix trello integration and make minor changes to courseware.json 2015-02-12 22:59:06 -08:00
Nathan Leniz d8baf3d588 Fix so routing handles /coursewares and /coursewares/ 2015-02-09 14:29:03 -05:00
Michael Q Larson b32d0219af remove errant comma 2015-02-09 07:57:53 -08:00
Michael Q Larson b84c514c29 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-08 23:46:23 -08:00
Michael Q Larson b71453f4e2 update the first 13 courseware challenges and remove some silly compliments 2015-02-08 23:46:08 -08:00
Nathan Leniz 0689793ef8 Remove debug statement 2015-02-08 14:25:26 -05:00
Nathan Leniz 9808db4f30 Fixing undefined challengeName on info pages 2015-02-08 14:24:42 -05:00
Nathan Leniz f572e4cb77 Simple fix for requesting challenges over challenge 53 2015-02-08 12:39:00 -05:00
Nathan Leniz 2b0428fe51 Fix old redirect in courseware.js 2015-02-08 00:57:37 -05:00
Michael Q Larson 180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
Michael Q Larson 4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware 
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
 2015-02-06 14:39:16 -05:00
Nathan Leniz 0313fd9751 Fixed routing for unfound coursewares 2015-02-06 14:28:28 -05:00
Nathan Leniz f627c156fc Tab now inserts two spaces, the path "coursewares/" is no longer broken 2015-02-06 12:36:55 -05:00
Nathan Leniz dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
Michael Q Larson 2314ab91c2 remove comma from resources that was haphazardly left there 2015-02-05 14:02:02 -08:00
Michael Q Larson bccc37f55d add more compliments and remove image validation from the profile image field 2015-02-05 13:56:44 -08:00
Nathan Leniz 5898de7ab9 Changes to courseware and bonfire controller to handle direction to next challenge if the user has completed all offerings, also show a flash message letting them know why they are being redirected 2015-02-04 23:27:57 -05:00
Michael Q Larson adfe5588d6 wire in points for courseware and bonfire 2015-02-04 19:39:57 -08:00
Michael Q Larson 98286e19d1 fix formatting of modals and make them less likely to accidentally wrap the compliment text 2015-02-04 19:00:40 -08:00
Nathan Leniz d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz 9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
Nathan Leniz 161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Nathan Leniz 26ee23ddf9 Fix for fibonacci challenge, fix routing issue for bonfire lookup 2015-02-04 15:32:31 -05:00
Nathan Leniz c487ddf18e Cleaning up bonfire.js 2015-02-04 14:59:45 -05:00
Nathan Leniz 9193ba04e0 Fix pathing bug for users who are not logged in and type /bonfires/ 2015-02-04 00:41:25 -05:00
Michael Q Larson f1000c3189 Merge branch 'master' into courseware 
Conflicts:
	controllers/bonfire.js
	views/layout.jade
 2015-02-02 23:32:46 -08:00
Michael Q Larson 78e473b4d2 another minor change to compliments 2015-02-02 23:03:50 -08:00
Nathan Leniz 43234825cf Removing needless CDN call, optimizing account view for slow page loads 2015-02-03 01:00:12 -05:00
Michael Q Larson f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -08:00
Michael Q Larson 0ee291878a remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js 2015-02-01 22:39:59 -08:00
Michael Q Larson 6ece608f01 update compliments 2015-02-01 22:00:19 -08:00
Michael Q Larson afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Nathan 186c090a20 Merge pull request #66 from FreeCodeCamp/update-url 
update bonfire URL on regex match if incomplete url
 2015-01-31 17:34:52 -08:00
Michael Q Larson 4c8c346a77 Revert "first commit with working iframe pulling data from code editor" 
This reverts commit d7d4727c0f.
 2015-01-31 16:56:23 -08:00
Michael Q Larson 0a49890517 Merge branch 'master' into angular-images 
Conflicts:
	controllers/user.js
	views/account/account.jade
 2015-01-31 16:44:56 -08:00
Michael Q Larson d26a4efea4 improve angular validation on images and trim input so trailing whitespace is ignored on save 2015-01-31 16:41:33 -08:00
Michael Q Larson 4d49875b8e Revert "start process of updating youtube videos on live-pair-programming" 
This reverts commit 7b0b12d348.
 2015-01-31 00:07:05 -08:00
Michael Q Larson a660e832b8 add welcome mailer for email signups and fix an issue with the angular validations 2015-01-31 00:04:35 -08:00
Michael Q Larson 7b0b12d348 start process of updating youtube videos on live-pair-programming 2015-01-30 23:59:21 -08:00
Michael Q Larson 68df7b218e update URL on regex match if incomplete url 2015-01-30 17:27:24 -08:00
Michael Q Larson d7d4727c0f first commit with working iframe pulling data from code editor 2015-01-29 17:01:50 -08:00
Michael Q Larson b49846a504 Add some clever new compliment messages 2015-01-29 16:10:49 -08:00
Michael Q Larson 2f59dd5e5b improve the tweet button functionality for both bonfire and challenges 2015-01-28 21:00:14 -08:00
Nathan Leniz 9fa0323049 Sequence request for new bonfire to wait until save operation, making bonfire fetch unsolved bonfires at a much faster rate to ensure data sync 2015-01-28 17:17:45 -05:00
Nathan Leniz 7ea08f3074 Add callback to and settimeout functions to prevent race conditions with write 2015-01-28 02:22:12 -05:00
Nathan Leniz 40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Nathan Leniz 4fcca641b6 Adding name to passed variables for generated bonfires 2015-01-27 22:46:18 -05:00
Nathan Leniz 5294462e4c Resolving issue with saving to "paired with" user profile 2015-01-27 22:25:48 -05:00
Michael Q Larson 2f0415ecf9 update the congratulatory text a bit 2015-01-27 14:46:05 -08:00
Nathan Leniz 01bdbd8f4d Finishing up pathing issues, writing user object if they haven't visited in a day 2015-01-27 17:39:53 -05:00
Nathan Leniz f97350ecf3 Fixed challenge ordering 2015-01-27 03:29:17 -05:00
Nathan Leniz be0cf978f5 Correctly sorting unsolved bonfires 2015-01-27 02:51:59 -05:00
Nathan Leniz 227c938445 massive redesign of user model and the way it interacts with bonfires, successfully returning next bonfire for the user, showing meet bonfire to unauthenticated users 2015-01-27 01:22:02 -05:00
Nathan Leniz 2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson f8343d4c13 full layout now works. refactor files and routes to have more conventional names and redirects where necessary 2015-01-26 11:38:19 -08:00
Nathan Leniz ead9fe56d1 Fixed bonfire to allow users to enter contractions 2015-01-26 12:30:04 -05:00
Michael Q Larson c20aa1697c generator now publishes directly to a view where you can interact with your new bonfire 2015-01-25 23:10:05 -08:00
Nathan Leniz 26c041826b Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more 2015-01-25 23:56:04 -05:00
Nathan Leniz d886a77858 Refactor random verbs, phrases, and compliments so that only the resources controller is concerned with how to fetch them and how to make them randomly. Remove debug statement from bonfire/show.jade 2015-01-25 10:02:41 -05:00
Michael Q Larson 0e63521ee0 refactor verbs, compliments and phrases into resources controller and require them where necessary. Create tutorial bonfire. Clean up existing bonfires. Fix minor ui issues. 2015-01-24 23:03:25 -08:00
Nathan Leniz 3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00
Michael Q Larson c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Michael Q Larson e115e6da22 Merge branch 'master' into bonfire 2015-01-24 11:29:43 -08:00
Michael Q Larson 1c0799bef0 start adding alternative congradulatory text 2015-01-24 11:28:18 -08:00
Nathan Leniz a7f228c410 Refactor db read/write ops to use find instead of findOne to improve performance 2015-01-24 14:21:44 -05:00
Nathan Leniz 0ca042a1f0 Paired with is now properly saved, bonfire challenge framework is almost ready for release 2015-01-24 13:40:58 -05:00
Nathan Leniz 4128b3b765 Existing username check now working, error box showing and hiding properly, UI tweaks 2015-01-24 12:51:53 -05:00
Nathan Leniz 022b8daddc Adding in existing username checking, NOT WORKING AT THE MOMENT 2015-01-24 04:14:41 -05:00
Nathan Leniz a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05:00
Nathan Leniz 6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Michael Q Larson d690f976f3 update the complete all the challenges flow and copy 2015-01-23 15:13:36 -08:00
Michael Q Larson 1f6cb10a32 fix a jquery exercise regression and make jquery exercises run in firefox 2015-01-23 00:30:34 -08:00
Nathan Leniz 0e9523ab72 More steps towards integrating the bonfire challenge framework. Importing challnge seed, public tests, private tests, entry point and entry point negator 2015-01-22 15:49:16 -05:00
Nathan Leniz 378277f0e1 More steps towards building the bonfire challenge interface 2015-01-22 13:20:46 -05:00
Nathan Leniz 094b937148 Incremental steps towards building the bonfire challenge views 2015-01-22 11:59:55 -05:00
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
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