Quincy Larson 
							
						 
					 
					
						
						
							
						
						1ab84010f6 
					 
					
						
						
							
							fix production issue  
						
						 
						
						
						
						
					 
					
						2015-06-02 20:30:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						85e907478d 
					 
					
						
						
							
							Remove debug  
						
						 
						
						
						
						
					 
					
						2015-05-31 18:45:51 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						c4a9285508 
					 
					
						
						
							
							Fix dasherization for stories,  closes   #648  
						
						 
						
						
						
						
					 
					
						2015-05-31 18:43:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						c74a8a7fc0 
					 
					
						
						
							
							Consisten dasherization in stories. Updated story cleanup script.  
						
						 
						
						
						
						
					 
					
						2015-05-25 23:27:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						27a35e65a7 
					 
					
						
						
							
							make a ton of small improvements related to github issues  
						
						 
						
						
						
						
					 
					
						2015-05-23 16:48:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						7279559c41 
					 
					
						
						
							
							Merge branch 'staging' into nonprofit-improvements  
						
						 
						
						... 
						
						
						
						Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade 
						
						
					 
					
						2015-05-22 19:36:15 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						b9adbd5976 
					 
					
						
						
							
							add jobs page  
						
						 
						
						
						
						
					 
					
						2015-05-22 19:30:56 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						a4be01aabb 
					 
					
						
						
							
							Merge  #470  
						
						 
						
						
						
						
					 
					
						2015-05-22 08:52:03 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						b58b725f9d 
					 
					
						
						
							
							Fix Lint all the controllers  
						
						 
						
						... 
						
						
						
						Fix many undefined variables
Fix many unhandled error calls 
						
						
					 
					
						2015-05-21 11:07:40 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						92f4c7a41a 
					 
					
						
						
							
							Use findone in controllers/story  
						
						 
						
						... 
						
						
						
						also fixes some linting issues
closes  #469  
						
						
					 
					
						2015-05-21 09:15:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						f3646b0aae 
					 
					
						
						
							
							give points for upvoting, add facebook profile attribute, improve social profile icons  
						
						 
						
						
						
						
					 
					
						2015-05-09 16:23:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						70503528d2 
					 
					
						
						
							
							give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib  
						
						 
						
						
						
						
					 
					
						2015-05-09 15:53:01 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						f53b8fafcb 
					 
					
						
						
							
							Merge pull request  #413  from terakilobyte/news-mailer-fix  
						
						 
						
						... 
						
						
						
						News mailer fix 
						
						
					 
					
						2015-05-04 13:53:03 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						749ff0cc74 
					 
					
						
						
							
							Fix mailer to point to new news route instead of stories  
						
						 
						
						
						
						
					 
					
						2015-05-03 20:41:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						289a757401 
					 
					
						
						
							
							fix moment and update .gitignore  
						
						 
						
						
						
						
					 
					
						2015-05-03 16:55:25 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						fb3a116fff 
					 
					
						
						
							
							Merge branch 'master' into mobile-news  
						
						 
						
						... 
						
						
						
						Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade 
						
						
					 
					
						2015-04-30 19:10:10 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						222f9b9a64 
					 
					
						
						
							
							fix some of the news functionality  
						
						 
						
						
						
						
					 
					
						2015-04-30 17:18:08 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						a8e215c74e 
					 
					
						
						
							
							Check everything for undefined in email reply logic for story.js  
						
						 
						
						
						
						
					 
					
						2015-04-27 20:03:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						5be9dd2587 
					 
					
						
						
							
							gracefully handle original story poster having been deleted in mailer  
						
						 
						
						
						
						
					 
					
						2015-04-26 23:19:03 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						20c2b7a0ac 
					 
					
						
						
							
							Merge branch 'maximization-352' of  https://github.com/Maximization/freecodecamp  into Maximization-maximization-352  
						
						 
						
						
						
						
					 
					
						2015-04-25 18:17:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						a9feb269f6 
					 
					
						
						
							
							Remove some debug/console.log statements.  
						
						 
						
						... 
						
						
						
						Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes  #367 . 
						
						
					 
					
						2015-04-25 12:28:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Maxim Orlov 
							
						 
					 
					
						
						
							
						
						1539708613 
					 
					
						
						
							
							Fix Camper News email notification logic  
						
						 
						
						
						
						
					 
					
						2015-04-25 16:05:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						7cbd8e1c04 
					 
					
						
						
							
							merge pr for unique story slugs  
						
						 
						
						
						
						
					 
					
						2015-04-20 00:28:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						8781bc3e63 
					 
					
						
						
							
							Accept comment edit pr  
						
						 
						
						
						
						
					 
					
						2015-04-19 22:22:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						f396dad029 
					 
					
						
						
							
							Fix upvote button on initial story submission.  
						
						 
						
						
						
						
					 
					
						2015-04-19 20:28:56 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						08bf658897 
					 
					
						
						
							
							Harden camper news and don't expose user object. Upvoting still needs to be looked at.  
						
						 
						
						
						
						
					 
					
						2015-04-19 03:36:54 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MrRenter 
							
						 
					 
					
						
						
							
						
						b2f18a790a 
					 
					
						
						
							
							Changed from post to put for since updating not creatings  
						
						 
						
						
						
						
					 
					
						2015-04-18 11:53:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MrRenter 
							
						 
					 
					
						
						
							
						
						790a4f941d 
					 
					
						
						
							
							Removed alert and added server side check for 10minutes  
						
						 
						
						
						
						
					 
					
						2015-04-18 02:46:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MrRenter 
							
						 
					 
					
						
						
							
						
						349dbbc2af 
					 
					
						
						
							
							Added functuality to the edit button. Added router to /commets/:id/edit as well as commentEdit method in story js.  
						
						 
						
						
						
						
					 
					
						2015-04-18 02:40:48 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						b9372b9af6 
					 
					
						
						
							
							Resolve merge conflicts using Webstorm's merge integration tool. v2  
						
						 
						
						
						
						
					 
					
						2015-04-17 00:39:48 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						b49d2fd343 
					 
					
						
						
							
							Resolve merge conflicts using Webstorm's merge integration tool.  
						
						 
						
						
						
						
					 
					
						2015-04-17 00:11:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						332d4f1875 
					 
					
						
						
							
							refactor story.js mailer and remove some cruft  
						
						 
						
						
						
						
					 
					
						2015-04-09 17:50:10 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						61e07041a7 
					 
					
						
						
							
							camper news reply emails go out to original story poster and poster of replied-to comment, works with old stories as well  
						
						 
						
						
						
						
					 
					
						2015-04-08 13:16:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						6242f322d7 
					 
					
						
						
							
							still working on passing original author email all the way down the comment chain  
						
						 
						
						
						
						
					 
					
						2015-04-08 00:30:51 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						1c7d0b11b6 
					 
					
						
						
							
							pass the original story URL to all comments for notification email  
						
						 
						
						
						
						
					 
					
						2015-04-07 23:39:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						bd7c5310b1 
					 
					
						
						
							
							improve the footer  
						
						 
						
						
						
						
					 
					
						2015-04-07 00:11:31 -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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jameskopacz 
							
						 
					 
					
						
						
							
						
						f5d6abdfef 
					 
					
						
						
							
							On story submission create unique story URL if slug already exists  
						
						 
						
						
						
						
					 
					
						2015-03-30 23:14:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						e9c6498cdf 
					 
					
						
						
							
							Error handling  
						
						 
						
						
						
						
					 
					
						2015-03-26 02:28:04 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						83d23ed2a4 
					 
					
						
						
							
							Remove sending 500 response to user manually and rely on middleware instead  
						
						 
						
						
						
						
					 
					
						2015-03-24 18:28:02 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						d0a00428d5 
					 
					
						
						
							
							Refactor story.js to use sendStatus instead of status, ensure returning on next(err)  
						
						 
						
						
						
						
					 
					
						2015-03-24 18:26:02 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						999ba14db7 
					 
					
						
						
							
							Fix indenting to 2 spaces, remove most lint errors  
						
						 
						
						
						
						
					 
					
						2015-03-22 20:20:08 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						fb5e8dc387 
					 
					
						
						
							
							Remove debug statement,  closes   #156 , story decay to 32 hours  
						
						 
						
						
						
						
					 
					
						2015-03-22 20:11:37 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						31ce7b686a 
					 
					
						
						
							
							User will now get a point for posting a story as well as receiving an upvote on a posted story  
						
						 
						
						
						
						
					 
					
						2015-03-22 20:07:08 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						9c5d9eea23 
					 
					
						
						
							
							try shorter decay rate  
						
						 
						
						
						
						
					 
					
						2015-03-21 00:47:21 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						752f4125d4 
					 
					
						
						
							
							Change decay rate of hot stories to 48 hours  
						
						 
						
						
						
						
					 
					
						2015-03-21 16:36:20 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						f1dcb4c373 
					 
					
						
						
							
							start fixing the password in scope potential corner case security issue  
						
						 
						
						
						
						
					 
					
						2015-03-17 17:22:58 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						f144e84310 
					 
					
						
						
							
							Merge pull request  #214  from MrRenter/upvoteFix  
						
						 
						
						... 
						
						
						
						Upvote fix 
						
						
					 
					
						2015-03-17 15:48:15 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						c9dd6366ec 
					 
					
						
						
							
							Compare against userIds  
						
						 
						
						
						
						
					 
					
						2015-03-18 05:01:14 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						8b491ed27e 
					 
					
						
						
							
							Fix display of comments if user is not logged in, disable reply button if no user, reject attempted comments if no user and no author  
						
						 
						
						
						
						
					 
					
						2015-03-17 17:44:52 +09:00