* 'master' of github.com:samuelclay/NewsBlur:
Renamed screenshots archived for v1.1.
Quick fix for duplicate feeds to be more specific. Also renaming screenshots of iOS app in anticipation for tomorrow's v1.2.
* 'master' of github.com:samuelclay/NewsBlur:
Correcting for include_favicons=false on flat feeds.
Adding ShareKit and its many associated dependencies. Instapaper, pinboard, twitter, facebook, and more sharing directly from the original story action button.
Fixing include_favicons to default to false, and correctly use a false value.
Marking all as read in Everything view. Refactored story detail view. Fixing bug around quicly tapping Next Unread and having the view pop before the next story is loaded.
* 'master' of github.com:samuelclay/NewsBlur:
Inverted logic on favicons fetching. Whoops. Fix in < 60 seconds, though.
Fixing the bug around favicon's not being found, since they were checking for the wrong property.
Logging al refresh_feeds requests.
* 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:
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.
