* master:
db03 is no longer a db.
Redis to db01.
Logging stripe use.
Paywall on signup.
Extending random holds for feeds while being crushed.
Minimum of MEMORY/256 workers.
Minimum of MEMORY/256 workers.
Bumping gunicorn workers.
Only recount feeds if necessary.
Only recount feeds if necessary.
Conflicts:
media/css/reader.css
* social:
Refactoring social profiles so that even new users have profiles. Thanks to @roycyang's new db setup for finding all of this.
Fixing bug if a user has no social profile.
Conflicts:
apps/social/views.py
* social:
Adding youtube video embeds back in.
Allowing empty email to be set.
Fixing issue in munin postgres fabfile.
Adding postgres standby commands + munin.
* social:
Fixing interactions and activities to only pull what's necessary. Otherwise doubles show up in android + ios.
Updating the shortcut text for sidebar collapsing.
* 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
