* master:
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Fixing #41: Adding REDIS to local_settings.py.template.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Switching to requests from urllib2/httplib. Bring on the page errors.
Adding a bunch fo keyboard shortcuts.
Adding elapsed time field to river and feed view.
Fixing autolinking of text links to no longer indiscriminately replace text, causing double encoding of html entities.
Fixing the space bar key to not queue, so it's actually useful now!
Refining media enclosures by adding all types and linking to their source.
Refining media enclosure detection.
* 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:
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: (124 commits)
Adding mark all as read action sheet for river of news in ios. Still needs hookup + server.
Adding method param error to /api/login and /api/signup.
Adding method param error to /api/login and /api/signup.
Fixing stale unread counts on feed list in iOS app when returning from river.
Saving duplicate read stories correctly.
Fixing gradient in story detail view in iOS.
Adding pages_fetched to munin.
New keyboard shortcut: m finds the oldest unread story.
Fixing exception when deleting bad user subs.
Skip broken classifiers when saving.
Speeding feed fetching back up.
Adding new db03 to mongodb mix.
Using mongodb nifty db resolution.
Testing out a slave read for getting stories.
Putting a time limit on collect_stats.
Simplifying the shit out of feed fetch histories.
Simplifying the shit out of feed fetch histories.
Trying to fix fetch histories with indexes. Also upating fabfile.py
Spreading out feed refreshing to the max.
Slowing down refreshed.
...
