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

169 Commits (0bbc803955b841719a066875eb2b311ef6df7824)

Author SHA1 Message Date
terakilobyte 5f6177378f Clean up more linting errors and split out returns from Mongo. 2015-04-24 13:15:15 -04:00
terakilobyte b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
Michael Q Larson 9d746f7d49 add zipline and basejump to portfolio view, and bonfires with solutions(not yet writing name to bonfireCompletion record on user 2015-04-05 00:01:51 -07:00
Michael Q Larson 44c5da8f72 improve the streak counter which previously wasn't defaulting to one day 2015-04-02 14:23:56 -07:00
Michael Q Larson 2328cc2927 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 
Conflicts:
	controllers/user.js
 2015-03-31 15:11:06 -07:00
Michael Q Larson a60c5eb92c refactor passport so that emails aren't fired if there are errors in save actions 2015-03-31 15:07:34 -07:00
Nathan Leniz 65a4c923b2 resolve merge conflicts 2015-03-29 00:51:09 +09:00
Michael Q Larson 672df775a2 add a zipline and a base jump to the seed file 2015-03-28 07:47:47 -07:00
Nathan Leniz 9e1a4a1348 Streak display in account/show.jade, refactor courseware.json for error handling and linting 2015-03-28 23:42:07 +09:00
Nathan Leniz 0a07c1e397 Streaks! 2015-03-28 17:38:11 +09:00
Nathan Leniz efd7707ac8 Move to Mongoose 4.0, begin implementation of streak 2015-03-28 11:34:12 +09:00
jameskopacz c17ff59aef Handle callback errors for user, bonfire, challenges, 
courseware, and resources controllers
 2015-03-26 23:41:06 -05:00
Nathan Leniz ac511982a4 User facing challenge mentions now point to coursewares, remove completed view from account/show 2015-03-21 18:42:19 +09:00
Nathan Leniz 9cdb2588b4 resolve merge conflict 2015-03-21 17:04:31 +09:00
Nathan Leniz a2e2e6bfa2 Improve profile view on devices, store name in completedCoursewares for display in account/show 2015-03-21 15:44:18 +09:00
Nathan Leniz b35f5ca59c Working on unifying coursewares view and logic 2015-03-21 13:42:02 +09:00
Nathan Leniz d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson 5a15da975f fix email validation issue #212 2015-03-17 23:18:03 -07:00
Berkeley Martinez 3b913be893 handle async flow/errors of profile update 2015-03-17 21:09:54 -07:00
Michael Q Larson 95c249afc6 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 
Conflicts:
	.gitignore
 2015-03-17 15:41:52 -07:00
Nathan Leniz 514b5ea572 fix bug in server side checking for username, closes #219 2015-03-18 07:15:25 +09:00
Michael Q Larson f3f6d0d16e update title for portfolio views and add public/js/bundle.js to gitignore 2015-03-17 10:06:17 -07:00
Michael Q Larson 8e8711d947 add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users 2015-03-11 23:58:16 -07:00
Nathan Leniz d6a6834971 Validate min length of 5 for username, 8 for password 2015-03-10 08:17:10 +09:00
Nathan Leniz 64d1c4a908 Server side checking of user input before allowing signup. 2015-03-09 18:35:56 +09:00
Nathan Leniz 3b3de541b3 Update username for stories and comments on username change in profile 2015-03-09 11:59:50 +09:00
Nathan Leniz 8608f48d8c Delete seed tasks, email signup now defaults a picture 2015-03-09 06:51:47 +09:00
Nathan Leniz 38dc4378df Add ranking algorithm to decay posts over time, add default image to user instead of gravatar 2015-03-09 06:09:51 +09:00
Nathan Leniz f367a0310e Finalizing display issues for news release 2015-03-08 16:50:51 +09:00
Michael Q Larson 120cc113b9 current work on d3 2015-02-22 23:47:30 -08:00
Michael Q Larson 53bbe90290 find a son format that works with d3 2015-02-21 21:45:25 -08:00
Michael Q Larson 74f6fc6763 continue work trying to get d3 to work 2015-02-20 23:55:19 -08:00
Nathan Leniz 3d7c7cf6b3 Remove debug statements from the server 2015-02-14 22:42:10 -05:00
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 bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08: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
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 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 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 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 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
Michael Q Larson e115e6da22 Merge branch 'master' into bonfire 2015-01-24 11:29:43 -08: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
Michael Q Larson d690f976f3 update the complete all the challenges flow and copy 2015-01-23 15:13:36 -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
terakilobyte 5765c18def Re-enabling password reset for email signups 2015-01-13 00:35:11 -05:00