* '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' of github.com:samuelclay/NewsBlur: (39 commits)
Adding logging for emails sent. Also using history.replaceState to clear the ?next= parameter.
Adding forgot password email with conveniences.
Seacucumber -> Django-ses. Celery isn't playing well.
Adding seacucumber as a dependency.
Adding android app to email. Also finalizing cleanup.
Finishing up new account email. Adding migration to save email sending preference.
Further fleshing out emails.
Adding autologin (with optout param) for use with emails.
Templating emails -- new account and new premium.
Changing color of logged user agent.
Adding browser user agent to all logging.
Fixing sizing on iphone app's original view's url.
Only active feeds get loaded in the iPhone app. It's about time.
Showing correct story_id in logging for bad read stories.
Showing HUD on logout in iphone app.
Completing the python api.
Showing the correct logging info for mismarked read stories.
Fixing river of new to use new user stories.
Re-running story read migration to account fornew read stories during the migration process.
Adding errors to API/login and API/signup. Getting rid of namespacing on login and signup form fields for api use.
...
Conflicts:
fabfile.py
