* master:
Fixing broken opml export due to missing feed icons.
Fixing slight bug in how active premiums were applied to feed update times.
Shift+U switches between read and unread. Thanks to @MLACitation: https://twitter.com/mlacitation/status/155371014560288768
Adding active_premium count. Setting a minimum of 1 hour fetches for feeds with any active premiums.
Allowing username refinement in fetching starred stories.
Increasing timeout on gunicorn to 2 min.
Adding management command to fetch starred stories on command.
* master:
Adding error handling for insta-fetching stories.
Turning off the page fetcher requests vs. urllib2 discrepency checker. I bet I've caught them all by now.
The @kennethreitz commit: logging all discrepencies between requests and urllib2. This should take a few hours.
* jammit:
Adding new iphone mask image.
Moving to proper unicode string for feed fetching.
Colorizing feed fetching.
Colorizing feed fetching.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues.
Adding shift+u as a shortcut for marking a story unread.
Adding more advanced exception handling for new requests module, with fallback to urllib2.
Adding urllib fallback to requests in page fetching.
Adding a little bit more leeway in page importer by falling back to urllib2 when requests fail.
Adding slight bit of color to feed fetcher.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Conflicts:
assets.yml
local_settings.py.template
media/js/jquery-1.7.1.js
media/js/jquery-1.7.js
media/js/vendor/jquery-1.7.js
