* master:
Wordpress PuSH errors aren't really errors, so don't log them.
Dealing with broken Wordpress PuSH plugin by subscribing to its requested topic url.
Dealing with broken Wordpress PuSH plugin by subscribing to its requested topic url.
Fixing Tumblr PuSH by sending the address instead of the link when subscribing.
Subscribing to a topic or hub sets the urls.
Launching real-time for premiums. Also fixing a few dupe feed refresh bugs.
Conflicts:
apps/reader/views.py
media/js/newsblur/common/assetmodel.js
* master:
Fixing hub url change subscription.
Adding failed push feeds to munin.
Showing correctly real-time status if feed is push.
Showing correct real-time status if feed is push.
Emergency fix to not have to reverse url in task fetchers.
Setting up push feeds for removal.
Adding munin graph for pushed feed queue and nginx conf.
Logging real-time.
Resubscribing to real-time feeds on add/remove feed.
Adding push feeds queue. Ignoring fat ping, since it might not match URLs.
Cleanup
Forgive push subscription errors.
Adding # of push feeds to munin.
Correcting a double-encoding bug for story permalinks that was from way back when.
Fixing the shit out of the feed fetcher's deleted feed handling. Also fixing PuSH support to correctly give parameters to PuSH server.
Checking for push hub links safetly.
Adding subscription callbacks for PuSH.
Stubbing in PuSH support. Need to work it in with Feeds and upgrade rel='hub'.
Conflicts:
apps/reader/models.py
media/js/newsblur/reader/reader.js
settings.py
utils/feed_fetcher.py
* 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' of github.com:samuelclay/NewsBlur:
Fixing bug around missing feed value when skipping fetch (and not updating last_update date).
Handling zlib/deflate issues, specifically for The Verge.
* 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 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:
Changing copy on premium/feedchooser dialog.
Styling errors on stripe payment form.
Final stripe.js tweaks before launch.
Adding Pay by Credit Card as an option to feed chooser dialog. Thus concludes Stripe.js integration. Time to launch!
Styling the stripe.js background.
Using correct kwargs for stripe signal.
Wrapping up stripe.js form. Has validation, styling, and does the right thing for new subscriptions. Needs a link to the form, though.
Setting up correct customer model for stripe webhook.
Moving JS assets to bottom of the page for faster loadtimes.
Fixing exception on missing param in feed address searching.
Fixing recommendation date serialization bug.
Fixing bugs around login with blank password using full password. Also fixing bug in signups with no username.
Stripe.js payments using zebra. Adding zebra as a vendored dependency. Webhooks and views all in. Needs styling, custom username and email fields, and loads of testing.
Adding error checking on requests in page fetching.
Using a probability from redis to determine whether or not to skip a fetch.
Allowing any password to be used on accounts with no password set.
Adding paypal logo.
Conflicts:
assets.yml
media/js/newsblur/reader/reader_feedchooser.js
settings.py
templates/base.html
* 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
