* master:
Updating copy on homepage.
Marking all as read on Everything view should clear folder unread counts.
Fixing error on committing to cache for rate limits when the dummy cache backend is used.
Conflicts:
templates/reader/feeds.xhtml
* master:
Adding linux.com story to press page.
Uniqifying stories when read.
Moving from sha module to hashlib.
Syncing time to account for time drift on VPS.
Fixing issue around showing too many Oh Nos on abort.
Save hash for address+link migration. necessary for a unique index.
Deprecating db02, moving redis and rabbitmq over to db01.
Updating nginx conf to support better amintenance pages giving a 503 status code.
Moving NewsBlur counts to beginning of title.
* 'master' of github.com:samuelclay/NewsBlur:
Adding two new columns, necessary for the feed_settings branch: hash of address+link, and locking address.
* 'master' of github.com:samuelclay/NewsBlur: (68 commits)
Marking read stories in Feed view as very much read. Gradientizing, too.
Fixing /m/ for no good reason.
File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
Fixing missing stories being updated bug.
Fixing issues around embedded content. Santizing HTML, but =preserving embed, object, and params.
Fixing iOS bug around the story progress indicator not being updated when returning from suspended state.
Bumping up the subscriber expire, now that I've got my wits back.
Stepping up feed fetch intervals.
No longer sanitizing HTML in feed parsing. I hope this doesn't bite me. But now Flash videos will appear in the feed.
Adding iphone icon as a logo that I can submit to sites.
Brief cleanup.
Finished suggestion to add unread counts to window title. Now a preference.
Adding color transform to read stories in Feed view.
As per a suggestion, making the max-width of the Feed view set to 700px. Great idea.
Fixing bug in send_story_email -- newlines in the subject line. Doh. Also adding story_Date to read_stories, in the hopes it could fix another bug for bad unread counts.
Fixing issues around broken existing stories on secondary vs primary.
Fixing mark_feed_stories_as_read, and fixing a bad MStory query.
Finishing the revamping mark as read button. Now confirms, as well as allows choice between entire feed/folder or just visible stories.
Adding bullshit user agent string because some sites are sniffing for browsers in order to serve the correct site.
Swapping out Instapaper and Email.
...
* master:
Fixing /m/ for no good reason.
File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
Fixing missing stories being updated bug.
Fixing issues around embedded content. Santizing HTML, but =preserving embed, object, and params.
* master:
Bumping up the subscriber expire, now that I've got my wits back.
Stepping up feed fetch intervals.
No longer sanitizing HTML in feed parsing. I hope this doesn't bite me. But now Flash videos will appear in the feed.
