* master:
Fixing missing status code in feed fetcher.
Fixing missing status code in feed fetcher.
Adding stathat stats for feed fetching and parsing.
Small cleanup to parameters of feed update method.
Refactoring starred stories indexes and adding hints.
Removing hints.
Adding hints, revising indexes on user stories, and trying to quicken feed fetching meta work.
Refactoring refresh feed unread counts. Fixing tests.
Adding task04 to fabfile.
Adding django 1.4 compatibility.
If feed no longer exists after update, find it, then schedule fetch.
Don't skip unfetched feeds.
Don't skip unfetched feeds.
Conflicts:
apps/reader/models.py
apps/reader/views.py
fabfile.py
utils/feed_fetcher.py
* 'master' of github.com:samuelclay/NewsBlur:
If feed no longer exists after update, find it, then schedule fetch.
Don't skip unfetched feeds.
Don't skip unfetched feeds.
* master:
Being more aggressive in determining if a URL is a feed.
Increasing modal zindex to battle Svbtle blogs sidebar.
Handle cases of user reading both old and new guid stories.
Checking for a signup that is really a login when importing GR.
* master:
Error handling in orphan detection.
Collecting orphaned feeds for users. These somehow got lost, and I'm not sure how. Eventually I'd like to run this on every user account.
Fixing issue around feed titles that disappear. This just confirms that the new feed title is substantive.
Uncommenting Readability sharing. This was written a loooong time ago, but their API is finally ready.
Fixing an issue around mal-formed requests aginst WordPress's Bad Behavior plugin, which checks for the 'Accept: *' header.
Fixing missing folder issue in iOS app. Occurs when user has no feeds in top level, when the Everything psuedo-folder obscures the top folder.
Conflicts:
apps/reader/models.py
* master:
Adding Mother Jones feeds for testing.
Fixing the ghost story unread count bug. Turns out it is a weird condition where a story changes its date after being published, but a user's mark_feed_as_read date is inbetween the new date and the original date, leading to a ghost unread story that can't be read.
Fixing errant linkify text bug that resulted in some javascript being executed and overwriting the page. Thanks to @aaronlidman for the help in identifying the bug.
Conflicts:
assets.yml
* master:
Adding tests in prep for Mother Jones duping.
Fixing rss feed tests.
Adding press story from Italian site Skimbu.
Adding Cuk.ch story about NewsBlur.
* master:
Fixing issue around feeds that are mistakenly declared as not having a page.
New audio control, with Flash fallback for browsers like Firefox/IE.
Conflicts:
assets.yml
* master:
Allow login from signup form.
Reducing celery prefetch to get more accurate queue sizes.
Removing RabbitMQ dependency. Moving to redis for task queuing.
Counting queue size for celery/redis.
Switching to redis to feed queuing. Also adding a weight for skipping feed fetches under high load.
Skipping feed resurrection.
Fixing last update problem that has been choking feed fetchers.
Fixing last update problem that has been choking feed fetchers.
Typo in feed pool drain.
Adding ability to wind down feed queue by faking requests.
Adding debug message about counting errors.
Conflicts:
fabfile.py
* master:
Fixing starred stories from not loading past the second page due to a missing flag reset.
Fixing user-found bug around tooltips continuing to show if the original dom element (and the reference to the tooltip) are destroyed too early, leaving a tooltip floating in the air.
Geometrically delaying the fetching of bad feeds, while they're still somewhat fresh.
Fixing error codes on statistics. Also fixing simple error on invalid feed.
Update media/js/newsblur/reader.js
Conflicts:
media/js/newsblur/reader/reader.js
* 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:
Adding build/ back to .gitignore.
Updating .gitignore.
Using dsa pem for retrieving rabbit update counts.
Preserving feed fetch error histories for 2 weeks.
Adding munin graph for known good feeds.
Turning down verbosity on feed tasking.
Adding known good feeds to munin to chart their progress.
Fixing headers overflow in Chrome.
Adding new feeds db column 'known_good', for forcing updates of feeds that were once good but are now throwing 500s.
Adding blogging OT press story.
