Commit Graph

188 Commits (8f7eea116a9a192df1e2376883696ebd7bbb8930)

Author SHA1 Message Date
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
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 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
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 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 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 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
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 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 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 5fb1cbf217 update usability 2014-12-05 11:58:39 -08:00
Michael Q Larson ec5fea2eaa start writing validations 2014-11-30 15:25:00 -08:00
Michael Q Larson 2f424def20 update mailer names 2014-11-30 00:49:55 -08:00
Michael Q Larson 72e2e7af04 update password reset mailer copy 2014-11-30 00:42:00 -08:00
Michael Q Larson abeebb9991 may have fixed email forms 2014-11-30 00:10:21 -08:00
Michael Q Larson d9502856dc SEO improvements suggested by Mark 2014-11-23 15:08:46 -06:00
Michael Q Larson 86d433aaba closer to getting ajax to work 2014-11-06 17:38:47 -08:00
Michael Q Larson 80fbe1dee4 fix nonprofit form and fix some mistakes in video links 2014-11-04 14:57:00 -08:00
Michael Q Larson 05c31ba15d firechat and firepad installed but not fully working 2014-10-12 01:51:55 -07:00
Sahat Yalkabov 5d5a882df8 Upgrade Nodemailer to 1.0 2014-07-15 17:21:09 -04:00
Sahat Yalkabov 2cbf836041 Switched from underscore to lodash library 2014-06-06 15:43:49 -04:00
Sahat Yalkabov 3c857f5b07 Updated user controller comments 2014-06-06 15:35:16 -04:00
Sahat Yalkabov bebc4aaf5c Added a flash message "your account has been deleted" 2014-06-06 15:30:07 -04:00
Sahat Yalkabov 4cf0f654fb Check if email is already taken when creating a new local account 2014-04-25 14:29:54 -04:00
Sahat Yalkabov af08279735 Redirect to original URL when users sign-in via Local strategy 2014-03-08 15:01:32 -05:00
Sahat Yalkabov c2cda88433 Merged forgot/reset controllers into user controller 2014-03-07 14:08:56 -05:00
Sahat Yalkabov 32eb2065e0 Renamed Referer to Referrer 2014-03-05 15:06:17 -05:00
Sahat Yalkabov 10c7f283e9 Code refactoring of redirect to last URL 2014-03-05 14:50:08 -05:00
Precious Jahlom Agboado 9aa923e90e Added a redirection to referrer page 2014-03-04 10:37:19 +00:00
Sahat Yalkabov e357b39700 Changed successful login message to "success" flash instead of "info" 2014-02-10 11:04:36 -05:00
Sahat Yalkabov 0d4f2ae8fd Merge branch 'master' of https://github.com/JahlomP/hackathon-starter into JahlomP-master
* 'master' of https://github.com/JahlomP/hackathon-starter:
  Replaced hardcoded success flash with express-flash
2014-02-10 10:58:31 -05:00
Sahat Yalkabov a456508e60 Update jsdoc strings 2014-02-07 10:21:18 -05:00
Sahat Yalkabov f3bcafb42f Remove mongoose reference 2014-02-07 09:57:05 -05:00
Precious Jahlom Agboado de3d62b66b Replaced hardcoded success flash with express-flash 2014-02-07 08:04:22 +00:00
Sahat Yalkabov 246b51a793 Removed redundant express-validator validations, notEmpty() 2014-02-01 03:53:50 -05:00
Sahat Yalkabov 7396a6d7ab Changed updatePassword controller validation to use express-validator instead of custom if statements 2014-02-01 03:39:11 -05:00
Sahat Yalkabov fdecdc5b53 Flash notification on OAuth Provider Unlink 2014-02-01 00:04:54 -05:00
Sahat Yalkabov e177ac10de Updated message if user with that email already exists 2014-01-31 22:18:57 -05:00
Sahat Yalkabov 967ab7fe0a Updating email on profile page will correctly update it in the databse. Fixes issue #25 2014-01-30 17:29:06 -05:00
Sahat Yalkabov 45d0c35f9d Update flash notifications on login, profile, signup pages to work with new express-flash 2014-01-28 17:41:13 -05:00
Sahat Yalkabov 940d52bd43 Fix [Object object] displayed on profile update success instead of the actual message text. 2014-01-27 07:58:32 -05:00
Sahat Yalkabov 11f9c12b1e Add Login route express validations 2014-01-23 22:47:21 -05:00
Sahat Yalkabov be73f9c62f Add express validators to signup page, replaces custom written if statements 2014-01-23 22:39:59 -05:00
Sahat Yalkabov a5eff415f0 POST signup controller updated username to email field during new User creation. 2014-01-18 01:56:55 -05:00
Sahat Yalkabov 3ed327e2e8 Updated jsdoc comments 2014-01-13 04:34:54 -05:00
Sahat Yalkabov 3dc90ac05b Updated error messages 2014-01-12 15:31:17 -05:00
Sahat Yalkabov bd36575122 Refactoring 2014-01-07 18:15:14 -05:00
Sahat Yalkabov e2184ae4ee Refactoring + improved validation on POST signup 2014-01-07 17:45:42 -05:00
Sahat Yalkabov 5559f2f8a5 Updated token unlinking 2014-01-07 14:35:23 -05:00
Sahat Yalkabov 5d5d546d25 Refactoring 2014-01-07 14:13:35 -05:00
Sahat Yalkabov 41f6b1c5f0 Renamed template account to profile 2014-01-07 13:37:13 -05:00
Sahat Yalkabov 6ad1073f7c Consolidated account login and signup templates under account folder 2014-01-07 13:36:44 -05:00
Sahat Yalkabov f660cd5129 Declared Passport helper middleware so you don't have to explicitly pass user: req.user explicitly to templates 2014-01-03 18:19:11 -05:00
Sahat Yalkabov 30a610be2c Cleaned up code + simplified 2013-12-20 14:12:29 -05:00
Sahat Yalkabov 2f0fe0eb27 Add authentication middleware to github route.
Removed old ios7 signup login page for now.
2013-12-20 02:39:51 -05:00
Sahat Yalkabov 6c00a31588 Comments on User controller routes 2013-12-20 01:59:05 -05:00
Sahat Yalkabov a6d762b071 Code refactoring 2013-12-20 00:50:44 -05:00
Sahat Yalkabov 010fc0c9fb Error handling via middleware in routes 2013-12-19 20:17:15 -05:00
Sahat Yalkabov 11e8385b77 Error handlers for some routes on users controller 2013-12-19 13:40:43 -05:00
Sahat Yalkabov efa84dba1b Removed unusued code and images 2013-12-19 13:16:32 -05:00
Sahat Yalkabov b98bf72107 Created username availability controller 2013-12-18 15:00:33 -05:00
Sahat Yalkabov 6e708d2998 Refactoring 2013-12-15 14:11:57 -05:00