* master:
Adding story permalink to story context-menu. Thanks to @grammargirl for the idea.
Adding task servers and updating automated deploy.
Removing dupe unique index in prep for social.
Adding 3 new task servers.
Conflicts:
apps/analyzer/models.py
fabfile.py
media/js/newsblur/reader/reader.js
utils/feed_fetcher.py
* master:
Adding dev role, updating hosts, and checking for wp-cron in broken wordpress plugin PuSH pings.
Stupid broken Wordpress PuSH plugin tries to set wp-admin/post.php to its topic.
Adding logging to PuSH push requests.
Change OPML export filename to use ISO date format
Fixing broken redirected PuSH urls. Typo on datetime.
Refactoring updated urls in PuSH feeds.
Adding db04 to hosts.
Feeds are OneToOne with PushSubscriptions, so remove the db inconsistency.
Cranking manual refresh polling when disconnected from pubsub.
Client-side push/pubsub should reconnect and degrade gracefully.
* 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:
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' of github.com:samuelclay/NewsBlur:
Adding all mongodb munin plugins, and adding fab command to install munin plugins for mongo.
Upgrading requests's ConnectionError to a first-class error, marking page as bad url.
Python module requests now throwing ConnectionError on bad urls. Handling by not emailing me about it.
Conflicts:
fabfile.py
* 'master' of github.com:samuelclay/NewsBlur: (39 commits)
Upgrading requests's ConnectionError to a first-class error, marking page as bad url.
Python module requests now throwing ConnectionError on bad urls. Handling by not emailing me about it.
Fixing bug where next unread story would be run twice when in Story view and opening a feed. Thanks to @dalmet for the issue.
Adding preference for default SSL. Redirects user to https.
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.
...
* 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
