Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						962675ee17 
					 
					
						
						
							
							feat(api): Add active user api  
						
						
						
						
					 
					
						2017-01-26 18:01:15 -08: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 
							
						 
					 
					
						
						
							
						
						44a0aeceb7 
					 
					
						
						
							
							feat(lint): prefer spread over Object.assign call  
						
						
						
						
					 
					
						2016-12-29 16:58:49 -08:00 
						 
				 
			
				
					
						
							
							
								Ivan Sebastian 
							
						 
					 
					
						
						
							
						
						a455ec0dc1 
					 
					
						
						
							
							show core team status in user profile  
						
						
						
						
					 
					
						2016-10-29 15:54:42 +07:00 
						 
				 
			
				
					
						
							
							
								Janice Shiu 
							
						 
					 
					
						
						
							
						
						0696825fc3 
					 
					
						
						
							
							standardize capitalization and fix typos  
						
						
						
						
					 
					
						2016-10-04 10:34:07 +08:00 
						 
				 
			
				
					
						
							
							
								Dylan 
							
						 
					 
					
						
						
							
						
						5e9f22e05f 
					 
					
						
						
							
							fix typo in user.json  
						
						
						
						
					 
					
						2016-09-24 10:44:18 -05: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 
							
						 
					 
					
						
						
							
						
						42de7c57ef 
					 
					
						
						
							
							Feature(nav): clicking on logo takes user to current challenge  
						
						
						
						
					 
					
						2016-08-03 15:51:28 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						1c9b419c2f 
					 
					
						
						
							
							Feature(challenges): challenges define their own requires  
						
						
						
						
					 
					
						2016-07-28 23:41:23 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						9a2dfca0fc 
					 
					
						
						
							
							Feature(settings): complete settings page logic  
						
						
						
						
					 
					
						2016-07-28 23:40:01 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						668bd74690 
					 
					
						
						
							
							Fix(lint): Add import eslint and fix import errors  
						
						
						
						
					 
					
						2016-07-28 23:40:01 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						078560c3ba 
					 
					
						
						
							
							Add language routing  
						
						
						
						
					 
					
						2016-07-28 23:40:01 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						ee4f1dbb73 
					 
					
						
						
							
							feature(translations): Normalize translations  
						
						... 
						
						
						
						translations are now listed under the prop "translations"
and keys to the IETF lang tag. 
						
						
					 
					
						2016-07-28 23:40:01 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						ccc5c3ec24 
					 
					
						
						
							
							Feature(challenges): Add hint system to challenges  
						
						
						
						
					 
					
						2016-07-28 23:40:01 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						c8b0a6cf74 
					 
					
						
						
							
							Submit projects  
						
						
						
						
					 
					
						2016-07-28 23:39:17 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						c909cd032e 
					 
					
						
						
							
							Add React Map  
						
						
						
						
					 
					
						2016-07-28 23:39:17 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						6898d961bf 
					 
					
						
						
							
							Normalize model json using generator loopback  
						
						
						
						
					 
					
						2016-07-28 23:39:17 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						4514d39eff 
					 
					
						
						
							
							Add challenge map service  
						
						
						
						
					 
					
						2016-07-28 23:39:17 -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 
							
						 
					 
					
						
						
							
						
						7b8dc2e77e 
					 
					
						
						
							
							Add friendly error message on auth create attemp  
						
						
						
						
					 
					
						2016-05-02 23:03:44 -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 
							
						 
					 
					
						
						
							
						
						428cf8135e 
					 
					
						
						
							
							user-identity  
						
						
						
						
					 
					
						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 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						be27deaa4c 
					 
					
						
						
							
							Merge pull request  #8124  from BerkeleyTrue/feature/re-add-announcement  
						
						... 
						
						
						
						(Re)add announcement/flyer 
						
						
					 
					
						2016-04-20 14:48:05 -07: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 
							
						 
					 
					
						
						
							
						
						02eb6cad6c 
					 
					
						
						
							
							Refactor announcement feature  
						
						
						
						
					 
					
						2016-04-14 20:06:42 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						c9fdb581ce 
					 
					
						
						
							
							Revert "Announcement feature"  
						
						
						
						
					 
					
						2016-04-14 18:13:58 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						17915e7ecf 
					 
					
						
						
							
							Revert "Fix give-brownie-points/about API DB queries"  
						
						
						
						
					 
					
						2016-04-14 17:07:40 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						66fda23dac 
					 
					
						
						
							
							Improve style on flash notification and make flyer conditional on logged in user with at least 6 points  
						
						... 
						
						
						
						Lower case model json file 
						
						
					 
					
						2016-04-13 23:10:46 +01:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						f0c8e06574 
					 
					
						
						
							
							rename the Flyer object to flyer  
						
						
						
						
					 
					
						2016-04-13 23:10:42 +01:00 
						 
				 
			
				
					
						
							
							
								benmcmahon100 
							
						 
					 
					
						
						
							
						
						d53a2eec86 
					 
					
						
						
							
							BillBoard now Flyer. Changes to API and view logic  
						
						... 
						
						
						
						Fix to replace of null error. Changed Flyer to flyer 
						
						
					 
					
						2016-04-13 23:10:34 +01:00 
						 
				 
			
				
					
						
							
							
								benmcmahon100 
							
						 
					 
					
						
						
							
						
						a27c5ccdd2 
					 
					
						
						
							
							Ground work for the bill board announcement feature  
						
						
						
						
					 
					
						2016-04-13 22:58:57 +01: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 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						e98fc9d9ff 
					 
					
						
						
							
							Remove Google and Facebook links from user profiles and settings page for privacy reasons  
						
						
						
						
					 
					
						2016-04-04 22:21:34 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						d47aed4850 
					 
					
						
						
							
							factor out settings page with email settings  
						
						
						
						
					 
					
						2016-03-14 23:59:24 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						e657b96dbc 
					 
					
						
						
							
							Coerce values to string before using validator methods  
						
						
						
						
					 
					
						2016-03-13 18:09:53 -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