Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								0ebd9c1970 
								
							 
						 
						
							
							
								
								Fixing sharing with shift+s and moving share dialog to story view.  
							
							 
							
							
							
						 
						
							2013-02-25 14:45:59 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								174c837271 
								
							 
						 
						
							
							
								
								Fixing last few story_view bugs.  
							
							 
							
							
							
						 
						
							2013-02-12 16:07:01 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								859eca8f6b 
								
							 
						 
						
							
							
								
								Switching back and forth with text view.  
							
							 
							
							
							
						 
						
							2013-02-12 13:15:14 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								ea46f70623 
								
							 
						 
						
							
							
								
								Layout for list view.  
							
							 
							
							
							
						 
						
							2013-02-08 11:26:29 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								facdb8db1c 
								
							 
						 
						
							
							
								
								Fixing broken river.  
							
							 
							
							
							
						 
						
							2013-02-05 18:18:22 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								83e6f951cc 
								
							 
						 
						
							
							
								
								Refactoring how folders see their unread children.  
							
							 
							
							
							
						 
						
							2013-02-05 16:03:55 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								fc81722ef2 
								
							 
						 
						
							
							
								
								Adding error handling to marking as unread.  
							
							 
							
							
							
						 
						
							2013-01-23 10:02:14 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								9bcfd0ad41 
								
							 
						 
						
							
							
								
								Upgrading to latest Backbone and Underscore. May break shit.  
							
							 
							
							
							
						 
						
							2013-01-14 12:50:00 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								6470c2ee08 
								
							 
						 
						
							
							
								
								Speeding up All Site Stories. Also beta-ing river with read_filter of all (not just unread).  
							
							 
							
							
							
						 
						
							2013-01-10 12:06:57 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								f9ae4baefe 
								
							 
						 
						
							
							
								
								Fixing broken reply interaction with links.  
							
							 
							
							
							
						 
						
							2013-01-03 17:56:01 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								ef772ff0d3 
								
							 
						 
						
							
							
								
								Hiding folders with no unread stories in Unread/Focus mode.  
							
							 
							
							
							
						 
						
							2013-01-02 17:44:14 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								029ff899af 
								
							 
						 
						
							
							
								
								Fixing reading social stories with no feed on river blurblog. Whew.  
							
							 
							
							
							
						 
						
							2012-12-13 17:58:19 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								6ac7878bb5 
								
							 
						 
						
							
							
								
								Flipping the switch: More than 64 sites, even added individually, now trigger the premium upgrade dialog.  
							
							 
							
							
							
						 
						
							2012-12-10 16:25:21 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								6cc67d90a5 
								
							 
						 
						
							
							
								
								Changing global feed to still be relative to the user.  
							
							 
							
							
							
						 
						
							2012-11-30 15:42:15 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								a7911316cd 
								
							 
						 
						
							
							
								
								Adding folder collapse for blurblogs.  
							
							 
							
							
							
						 
						
							2012-10-01 13:07:45 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								79d07cac05 
								
							 
						 
						
							
							
								
								Fixing JS issues around stories with no feeds clobbering the river view.  
							
							 
							
							
							
						 
						
							2012-09-27 10:44:55 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								dff45202b1 
								
							 
						 
						
							
							
								
								New feed selector now works to find feed by keyword.  
							
							 
							
							
							
						 
						
							2012-09-26 13:49:17 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								1252819c8c 
								
							 
						 
						
							
							
								
								Fixing issue when opening feed in Story view but second story gets selected instead of first.  
							
							 
							
							
							
						 
						
							2012-09-21 11:36:27 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								11a2f735a2 
								
							 
						 
						
							
							
								
								Using parent folder to update all parent folders on read story.  
							
							 
							
							
							
						 
						
							2012-08-27 14:50:36 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								5c819b01b3 
								
							 
						 
						
							
							
								
								Fixing double-cpunting bug and cleaning up unread counts on friend subs.  
							
							 
							
							
							
						 
						
							2012-08-10 10:02:43 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								4fc9693b36 
								
							 
						 
						
							
							
								
								Marking friend socialsubs as read when reading a story from another feed or socialsub where the friend has shared the story.  
							
							 
							
							
							
						 
						
							2012-08-08 11:52:59 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								0ea2cba95a 
								
							 
						 
						
							
							
								
								Big changes to blurblogs. Editing comments inline. Deleting comments inline. Removing sideoptions on blurblogs. Streamlining. Robusticizing. Shipping.  
							
							 
							
							
							
						 
						
							2012-08-06 17:52:33 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								d8d9c027e3 
								
							 
						 
						
							
							
								
								Truncating story content on blurblogs.  
							
							 
							
							
							
						 
						
							2012-08-02 19:04:20 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								7f0136ae82 
								
							 
						 
						
							
							
								
								Adding URLs for folders, including the Everything folder.  
							
							 
							
							
							
						 
						
							2012-08-02 12:41:11 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								5da380c12e 
								
							 
						 
						
							
							
								
								Fixing small bugs: feed sort order, unread/oldest not respecting mark as read date.  
							
							 
							
							
							
						 
						
							2012-08-02 11:04:11 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								b27507d91b 
								
							 
						 
						
							
							
								
								Fixing bug where missing feeds found in the folders blob would cause subsequent folders not to show in Safari (Chrome and Firefox were fine) due to a DOM rendering bug. Also fixing issue with updating unread counts on social subs.  
							
							 
							
							
							
						 
						
							2012-08-01 20:30:16 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								f40c96b226 
								
							 
						 
						
							
							
								
								Fixing send story by email. Also adding update_counts field to feeds/flat.  
							
							 
							
							
							
						 
						
							2012-08-01 18:54:51 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								73f9568d14 
								
							 
						 
						
							
							
								
								Fixing the living hell out of the Next Unread button. Works at the bottom of the feed list, when on a selected story that is still unread (marked as unread), and still pages, looking for the last unread story.  
							
							 
							
							
							
						 
						
							2012-07-31 15:58:06 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								ec08d68414 
								
							 
						 
						
							
							
								
								Cleaning blurblog url on profiles.  
							
							 
							
							
							
						 
						
							2012-07-29 11:21:40 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								90f746d1ff 
								
							 
						 
						
							
							
								
								Tons of small styling cleanups. Also fixing refresh throttling.  
							
							 
							
							
							
						 
						
							2012-07-29 00:49:34 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								12ec0d1f05 
								
							 
						 
						
							
							
								
								Simplifying dashboard by including current user's profile photo, linking to their profile.  
							
							 
							
							
							
						 
						
							2012-07-28 19:53:38 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								2b2ef7f15c 
								
							 
						 
						
							
							
								
								Merge branch 'social' into redis  
							
							 
							
							... 
							
							
							
							* social:
  Auto-linkifying comments and replies, and stripping html from comments, replies, and story titles, tags, and authors.
  Adding compacting to user sub folders, to remove dupe subscriptions.
  Clearing folders and decoding unicode.
  Typo in gunicorn conf.
  Only using appropriate number of gunicorn processes, making this machine agnostic.
  Deferring OPML import if it takes > 20 seconds. Email user when complete. Also, hamburgers. This one's for @torrez.
  Adding vps roles to fabfile.
Conflicts:
	apps/reader/views.py
	apps/social/models.py 
							
						 
						
							2012-07-21 16:43:23 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								18428a32a1 
								
							 
						 
						
							
							
								
								Auto-linkifying comments and replies, and stripping html from comments, replies, and story titles, tags, and authors.  
							
							 
							
							
							
						 
						
							2012-07-21 16:38:37 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								a4414eebde 
								
							 
						 
						
							
							
								
								Adding oldest/newer order to feeds and river. Also adding unread/all read filter to both as well. Including stubbed segmented control for switching between modes on a per-feed basis. Still needs global preference and glue to hook them up.  
							
							 
							
							
							
						 
						
							2012-07-18 18:34:19 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								9b5d9bdea9 
								
							 
						 
						
							
							
								
								Fixing bug when a story changes its guid (like on a tumblr rename), but it still thinks it has comments. Forcing each story to recount its comments if comments are claimed, just in case.  
							
							 
							
							
							
						 
						
							2012-07-11 10:52:50 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								63c8e0691a 
								
							 
						 
						
							
							
								
								console.log -> NEWSBLUR.log  
							
							 
							
							
							
						 
						
							2012-07-10 15:26:34 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								a82492f928 
								
							 
						 
						
							
							
								
								Big conversion from only displaying friends comments to showing both friends and public, still separated. Big design changes to comments on blurblogs, as well.  
							
							 
							
							
							
						 
						
							2012-07-03 12:53:56 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								78c5134fa6 
								
							 
						 
						
							
							
								
								Adding in replies on blurblogs. Still needs to post, handle errors, and work.  
							
							 
							
							
							
						 
						
							2012-07-02 15:40:03 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								11f5fadc9d 
								
							 
						 
						
							
							
								
								Fixing bug where you could not traverse stories after training a story into a hidden score. Thanks to @afita for the amazing discovery.  
							
							 
							
							
							
						 
						
							2012-07-01 12:49:08 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								8def3a8ebf 
								
							 
						 
						
							
							
								
								Fixing delete feed to include folder title.  
							
							 
							
							
							
						 
						
							2012-06-27 12:16:18 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								cc64440ae4 
								
							 
						 
						
							
							
								
								Fixing preference for only showing single story at a time in the Feed view.  
							
							 
							
							
							
						 
						
							2012-06-26 13:31:37 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								0e8cf258d2 
								
							 
						 
						
							
							
								
								Fixing issues around marking story as read after delay.  
							
							 
							
							
							
						 
						
							2012-06-26 11:26:45 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								ef6ba48dc3 
								
							 
						 
						
							
							
								
								Fixing issues around missing feeds. Also fixing issue with scrolling in temp Feed view.  
							
							 
							
							
							
						 
						
							2012-06-19 13:01:30 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								e40b93882a 
								
							 
						 
						
							
							
								
								Fixing issue around feeds thinking they are unfetched.  
							
							 
							
							
							
						 
						
							2012-06-18 15:59:31 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								790e87e723 
								
							 
						 
						
							
							
								
								Fixing next unread button in social feed.  
							
							 
							
							
							
						 
						
							2012-06-14 17:53:39 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								05fce0124a 
								
							 
						 
						
							
							
								
								Correctly updating counts on stories read in social sites but also subscribed to by the user.  
							
							 
							
							
							
						 
						
							2012-06-14 17:38:09 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								df50ccf101 
								
							 
						 
						
							
							
								
								Fixing original view marking red stories as selected and not just read.  
							
							 
							
							
							
						 
						
							2012-06-14 16:17:20 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								2d009d3d80 
								
							 
						 
						
							
							
								
								Fixing Previous button, also fixing river of news feed styling and collapsed folder styling.  
							
							 
							
							
							
						 
						
							2012-06-14 15:30:34 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								e501c6bdee 
								
							 
						 
						
							
							
								
								Cleaning up a few small bugs in push for backbone.  
							
							 
							
							
							
						 
						
							2012-06-14 15:03:20 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Samuel Clay 
								
							 
						 
						
							
							
							
							
								
							
							
								5e55999123 
								
							 
						 
						
							
							
								
								Find oldest unread story.  
							
							 
							
							
							
						 
						
							2012-06-13 17:34:26 -07:00