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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						fa47ed9afb
					 | 
					
						
						
							
							remove extra debugs
						
						
						
						
						
						
					 | 
					
						2015-07-29 15:10:03 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						5533779d45
					 | 
					
						
						
							
							add give brownie points!!!!
						
						
						
						
						
						
					 | 
					
						2015-07-29 15:00:24 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						9731e8ccc6
					 | 
					
						
						
							
							fix return callbacks
						
						
						
						
						
						
					 | 
					
						2015-07-29 11:41:41 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						9e22122832
					 | 
					
						
						
							
							adds user/about
						
						
						
						
						
						
					 | 
					
						2015-07-29 11:32:16 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						e08f895769
					 | 
					
						
						
							
							Handle invalid login
						
						
						
						
						
						
					 | 
					
						2015-06-16 00:29:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						070c248132
					 | 
					
						
						
							
							Handle invalid login
						
						
						
						
						
						
					 | 
					
						2015-06-16 00:27:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						c4d229e62d
					 | 
					
						
						
							
							remove email verification step.
						
						
						
						
						
						
						
						users are marked for future uses 
						
						
					 | 
					
						2015-06-15 15:43:12 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						f6fbe6e9c7
					 | 
					
						
						
							
							make username unique and make username required
						
						
						
						
						
						
					 | 
					
						2015-06-12 16:40:49 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						d07e5351ea
					 | 
					
						
						
							
							Comment out blacklist
						
						
						
						
						
						
					 | 
					
						2015-06-12 18:55:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						e29a340afb
					 | 
					
						
						
							
							add blacklisted usernames to loopback user validations
						
						
						
						
						
						
					 | 
					
						2015-06-12 13:54:38 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						070a80cb79
					 | 
					
						
						
							
							set saltfactor for Passwords
						
						
						
						
						
						
					 | 
					
						2015-06-12 11:38:00 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						a5092d379d
					 | 
					
						
						
							
							Merge conflicts and clean up lint errors.
						
						
						
						
						
						
					 | 
					
						2015-06-11 21:08:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						223ea2a393
					 | 
					
						
						
							
							Merge conflicts and clean up lint errors.
						
						
						
						
						
						
					 | 
					
						2015-06-11 21:08:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						3017991de5
					 | 
					
						
						
							
							Finished local user login flow
						
						
						
						
						
						
					 | 
					
						2015-06-11 21:03:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						c2f408fb56
					 | 
					
						
						
							
							add blacklist to usernames
						
						
						
						
						
						
					 | 
					
						2015-06-11 17:04:48 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						5be6ce7193
					 | 
					
						
						
							
							add delete user idenity and credentials after profile deletion
						
						
						
						
						
						
					 | 
					
						2015-06-11 16:57:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						34c3fef7d4
					 | 
					
						
						
							
							Move api hooks to user.js
						
						
						
						
						
						
					 | 
					
						2015-06-11 19:11:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |