* 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: (26 commits)
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.
Inverting the count for fetched feeds.
Fixing numerous feed fetching errors.
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
Adding asset-less deployment.
Upgrading feedparser from 5.0.1 to 5.1.
Catching errors in page links with ill-formed urls.
...
* 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:
New preference: action to perform when opening a feed -- jump to either newest or oldest story automatically.
Conflicts:
media/js/newsblur/reader/reader.js
