NewsBlur-viq/vendor
Samuel Clay aaa5aa1cd6 Merge branch 'master' into social
* 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
2012-02-29 16:22:47 -08:00
..
cjson Adding cjson repo. 2011-08-22 20:10:07 -07:00
opml Adding recovery parameter to OPML parser. 2011-06-10 11:14:29 -04:00
paypal Adding Pay by Credit Card as an option to feed chooser dialog. Thus concludes Stripe.js integration. Time to launch! 2012-02-29 12:15:01 -08:00
reverend Utils -> vendor 2011-04-11 21:57:45 -04:00
seacucumber Adding vendorized seacucumber, for when I hate amazon ses. 2011-10-26 20:31:44 -07:00
timezones Adding profile field for completing the tutorial. 2011-05-12 18:15:15 -04:00
tweepy Adding Facebook OAuth and friend list saving. 2011-12-20 11:49:49 -08:00
typogrify Utils -> vendor 2011-04-11 21:57:45 -04:00
yuicompressor-2.4.2 Utils -> vendor 2011-04-11 21:57:45 -04:00
zebra Wrapping up stripe.js form. Has validation, styling, and does the right thing for new subscriptions. Needs a link to the form, though. 2012-02-28 17:37:01 -08:00
__init__.py Utils -> vendor 2011-04-11 21:57:45 -04:00
facebook.py Adding Facebook OAuth and friend list saving. 2011-12-20 11:49:49 -08:00