* master:
Adding asset-less deployment.
Upgrading feedparser from 5.0.1 to 5.1.
Catching errors in page links with ill-formed urls.
Not showing the world favicon until favicons are downloaded.
Fixing feed exception dialog to actually reload feeds on the page.
Geometrically decaying feed fetches on known good feeds that have gone bad.
Fixing issue around empty original pages.
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Re-styling the crap out of all taskbar buttons. Much more streamlined now.
Tweaking the living crap out of the intelligence control's colors. Lightened.
User feedback: hiding positive and negative unread counts in title if there are no unread stories outside of neutral.
Correcting typo in dupe feed resolution.
Local settings in fabfile.
Fixing up a minor detail in the new intelligence control.
Rewriting intelligence slider to be an intelligence control (segmented control). Should make a ton more intuitive sense.
Trying to fix IE troubles by forcing single requests per read story.
Fixing nginx conf to support ssl.
Adding PID files to gitignore.
Ignoring files.
Adding certificates to ignore.
Adding https to nginx.
Conflicts:
media/css/reader.css
media/js/newsblur/common/assetmodel.js
* master:
Renaming static.tar to static.tgz to reflect its gzippedness.
Fixing ghost unread counts on folder when last story in a feed is read.
Fixing link to scipy-superpack. (Thanks @boursier)
Handling negative feature page bug. Also showing server errors on bad emails.
Fixing missing username in dupe USF.
Handling errors on river in client. Also fixing starred stories.
Suppressing error on starring an already starred story.
Re-enabling mobile site. /m/
Fixing typo in aggressive feed fetching.
No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh.
Adding SSL to nginx conf.
Conflicts:
apps/reader/views.py
assets.yml
media/js/newsblur/reader/reader.js
* 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.
