Mrugesh Mohapatra 
							
						 
					 
					
						
						
							
						
						566de3e3f2 
					 
					
						
						
							
							fix: Update config to be flexible for host  
						
						
						
						
					 
					
						2017-03-20 12:13:27 +00:00 
						 
				 
			
				
					
						
							
							
								Peter Weinberg 
							
						 
					 
					
						
						
							
						
						3ed485b14a 
					 
					
						
						
							
							chore(common): updated common to freeCodeCamp  
						
						
						
						
					 
					
						2017-01-14 19:49:01 -05:00 
						 
				 
			
				
					
						
							
							
								Dylan 
							
						 
					 
					
						
						
							
						
						79a8c412f1 
					 
					
						
						
							
							change node-uuid to uuid  
						
						
						
						
					 
					
						2016-12-30 16:47:09 -06:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						94c4c846e9 
					 
					
						
						
							
							Feature(theme): add nightmode react logic  
						
						... 
						
						
						
						We wait to load the user before applying the theme
as we will begin aggressively caching most of the react
app routes. This means we can not depend on user data to
determine. 
						
						
					 
					
						2016-08-06 07:24:10 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						9a2dfca0fc 
					 
					
						
						
							
							Feature(settings): complete settings page logic  
						
						
						
						
					 
					
						2016-07-28 23:40:01 -07:00 
						 
				 
			
				
					
						
							
							
								Mrugesh Mohapatra 
							
						 
					 
					
						
						
							
						
						85a1212da5 
					 
					
						
						
							
							Error messages for invalid tokens from email links  
						
						... 
						
						
						
						This commit, adds error messages for users hiting the confirm
endpoint with invalid, or expired tokens from emailed links. 
						
						
					 
					
						2016-07-12 11:46:11 +00:00 
						 
				 
			
				
					
						
							
							
								Mrugesh Mohapatra 
							
						 
					 
					
						
						
							
						
						546737e6be 
					 
					
						
						
							
							fix password validate crash  
						
						
						
						
					 
					
						2016-06-23 00:55:15 +05:30 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						bbcadd1fc5 
					 
					
						
						
							
							fix a typo in notification  
						
						
						
						
					 
					
						2016-06-08 01:13:11 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						e29a2a9716 
					 
					
						
						
							
							feature(email): add ability to verify current email  
						
						
						
						
					 
					
						2016-06-02 15:23:49 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						942962fa0f 
					 
					
						
						
							
							Add prod urls to verify emails  
						
						
						
						
					 
					
						2016-06-02 13:49:34 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						564f4c1180 
					 
					
						
						
							
							Update email info copy  
						
						
						
						
					 
					
						2016-06-02 13:48:56 -07:00 
						 
				 
			
				
					
						
							
							
								Mrugesh Mohapatra 
							
						 
					 
					
						
						
							
						
						ff4dfb09da 
					 
					
						
						
							
							Add email verification and notifications  
						
						... 
						
						
						
						This commit
- [x] Fixes the flash notice color (Trivial)
- [x] Adds flash message for user with no email.
- [x] Adds checks to see if user's email is verified, and displays corresponding notification.
- [x] Adds email templates. 
						
						
					 
					
						2016-06-01 08:34:34 +00:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						ee2e0e290f 
					 
					
						
						
							
							Merge branch 'fix/theme-flash' of  https://github.com/BerkeleyTrue/FreeCodeCamp  into BerkeleyTrue-fix/theme-flash  
						
						... 
						
						
						
						Conflicts:
	common/models/user.js 
						
						
					 
					
						2016-05-12 21:28:29 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						e72ad8c513 
					 
					
						
						
							
							fix(ui): Fix flash shown to user on page refresh  
						
						... 
						
						
						
						Store user theme preference on user object.
Must be logged in to use themes 
						
						
					 
					
						2016-05-12 18:52:03 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						04b874de45 
					 
					
						
						
							
							Fix email validations  
						
						
						
						
					 
					
						2016-05-12 16:16:36 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						8166bfbcd8 
					 
					
						
						
							
							Remove o-auth account creation  
						
						... 
						
						
						
						Accounts can only be created with Github or email 
						
						
					 
					
						2016-05-02 21:26:47 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						e65d55a3f7 
					 
					
						
						
							
							Change update email endpoint  
						
						
						
						
					 
					
						2016-05-02 17:22:46 -07:00 
						 
				 
			
				
					
						
							
							
								Mrugesh Mohapatra 
							
						 
					 
					
						
						
							
						
						3d55b9bb8b 
					 
					
						
						
							
							Add Update Email View  
						
						... 
						
						
						
						This commit:
- Displays the user's email that we have on records
- Adds a button in the settings to update email
- Adds a form view to update the email
- Fixes CSS for the Email icons and the email form
                         ~ Credits to @hallaathrad
- Linting fixes and updated with Berkeley's Comments
- Streamline checks and fix scope
- Add AJAX Calls
- Add flash messages
- Update the views & add XHR value 
						
						
					 
					
						2016-05-02 18:33:37 +00:00 
						 
				 
			
				
					
						
							
							
								Aniruddh Agarwal 
							
						 
					 
					
						
						
							
						
						09bf747cfc 
					 
					
						
						
							
							Change ESLint quote-props rule to as-needed  
						
						... 
						
						
						
						Also fixes all files flagged by the rule 
						
						
					 
					
						2016-04-16 00:31:13 +08:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						17915e7ecf 
					 
					
						
						
							
							Revert "Fix give-brownie-points/about API DB queries"  
						
						
						
						
					 
					
						2016-04-14 17:07:40 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						7f24986c58 
					 
					
						
						
							
							Fix give-brownie-points/about API DB queries  
						
						... 
						
						
						
						This should speed up these api calls significantly 
						
						
					 
					
						2016-04-11 15:46:22 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						1308d312a4 
					 
					
						
						
							
							Add methods to get challengeMap  
						
						... 
						
						
						
						Update boot/challenge.js to use new methods
Update boot/user.js to use new methods 
						
						
					 
					
						2016-04-06 21:11:07 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						74592e72b4 
					 
					
						
						
							
							Update eslint, fix lint issues  
						
						
						
						
					 
					
						2016-03-03 17:53:33 -08:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						8ef3fdb6a0 
					 
					
						
						
							
							Initial move to redux  
						
						
						
						
					 
					
						2016-03-03 17:53:33 -08:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						a4dd9667ca 
					 
					
						
						
							
							Fix typos  
						
						
						
						
					 
					
						2016-02-10 10:09:40 -08:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						76cfbdf752 
					 
					
						
						
							
							challenge/user router now works with challengeMap  
						
						
						
						
					 
					
						2016-02-10 10:09:40 -08:00 
						 
				 
			
				
					
						
							
							
								Arsen Melikyan 
							
						 
					 
					
						
						
							
						
						a5bde55f6e 
					 
					
						
						
							
							Fixes incorrect redirection to map-aside  
						
						
						
						
					 
					
						2016-01-17 13:28:03 +04:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						8c3e14cd8e 
					 
					
						
						
							
							Fix commit redirect for non signed user.  
						
						... 
						
						
						
						Now users will be directed to sign in page and on sign in
will have pledge completed 
						
						
					 
					
						2015-12-29 10:57:35 -08:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						80bb80b23a 
					 
					
						
						
							
							minor updates to copy  
						
						
						
						
					 
					
						2015-12-28 16:28:53 -06:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						600ca2f8ad 
					 
					
						
						
							
							Fix duplicate email sign in  
						
						
						
						
					 
					
						2015-12-28 13:52:28 -08:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						7e9d65675a 
					 
					
						
						
							
							Merge branch 'master' into remove-angular  
						
						... 
						
						
						
						Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade 
						
						
					 
					
						2015-12-04 18:49:38 -06:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						1e439aa4c5 
					 
					
						
						
							
							hotfix brownie points  
						
						
						
						
					 
					
						2015-10-15 00:33:45 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						51af4e4b0d 
					 
					
						
						
							
							Merge branch 'google-cdns' into remove-angular  
						
						... 
						
						
						
						Conflicts:
	server/boot/user.js
	server/views/account/show.jade
	server/views/account/signin.jade
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade 
						
						
					 
					
						2015-09-23 09:56:01 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						df3918cc53 
					 
					
						
						
							
							fix email login not case sensitive  
						
						
						
						
					 
					
						2015-08-25 22:27:01 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						1dadc48aea 
					 
					
						
						
							
							remove angular from user account creation flows  
						
						
						
						
					 
					
						2015-08-19 15:55:40 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						456bf20b05 
					 
					
						
						
							
							fix should hard code domain for password reset  
						
						
						
						
					 
					
						2015-08-18 01:40:26 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						1d3f7331fb 
					 
					
						
						
							
							email reset use port in dev  
						
						
						
						
					 
					
						2015-08-18 01:32:38 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						112972cfdd 
					 
					
						
						
							
							fix enables email login  
						
						
						
						
					 
					
						2015-08-18 01:32:37 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						de7eb3d440 
					 
					
						
						
							
							fix email password reset  
						
						
						
						
					 
					
						2015-08-16 09:54:59 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						129eebcc41 
					 
					
						
						
							
							fix type should be rand not updated  
						
						
						
						
					 
					
						2015-08-15 12:28:19 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						13b38aefb5 
					 
					
						
						
							
							add random attribute to user props  
						
						... 
						
						
						
						Allows easier random sampling 
						
						
					 
					
						2015-08-15 12:19:36 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						7bfe61731b 
					 
					
						
						
							
							give a user a brownie point when they start  
						
						
						
						
					 
					
						2015-08-10 20:55:01 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						ce9e2ebcae 
					 
					
						
						
							
							fix test email for string  
						
						
						
						
					 
					
						2015-08-05 22:56:23 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						0ce81bbabb 
					 
					
						
						
							
							fix email sign should not require username  
						
						
						
						
					 
					
						2015-08-05 19:29:17 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						8c7a9dd818 
					 
					
						
						
							
							fix trim and lowercase user username and email  
						
						
						
						
					 
					
						2015-08-05 18:51:15 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						70c5bcea20 
					 
					
						
						
							
							fix error message string  
						
						
						
						
					 
					
						2015-08-04 10:52:41 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						c2720d784c 
					 
					
						
						
							
							add debug flag to giveBrowniePoints endpoint  
						
						
						
						
					 
					
						2015-08-01 20:08:32 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						e7f522a611 
					 
					
						
						
							
							fix giveBrowniePoints error messages  
						
						
						
						
					 
					
						2015-07-31 13:45:45 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						0e21d6eb30 
					 
					
						
						
							
							set browniePoints timeout to 30 seconds for dev  
						
						
						
						
					 
					
						2015-07-31 12:45:34 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						f1b964a26d 
					 
					
						
						
							
							send back user bio on giveBroniePoints  
						
						
						
						
					 
					
						2015-07-31 12:16:27 -07:00