Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master #107

Merged
merged 14 commits into from
Dec 4, 2017
Merged

Merge master #107

merged 14 commits into from
Dec 4, 2017

Commits on Nov 16, 2017

  1. Fix AccountApplicationDeauthorizeWebhook for non-account events

    @blueyed
    blueyed committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    7c55920 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2017

  1. Add UniquePerAccountStripeObject for Plans 

    The `stripe_id` for plans is not unique by itself globally (it is not generated
by Stripe), and therefore needs to be unique per account.
    @blueyed
    blueyed committed Nov 24, 2017
    Configuration menu
    Copy the full SHA
    2ba464f View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2017

  1. Add Charge.outcome

    @blueyed
    blueyed committed Nov 27, 2017
    Configuration menu
    Copy the full SHA
    d3731c5 View commit details
    Browse the repository at this point in the history

  2. Charge: add pk to __repr__

    @blueyed
    blueyed committed Nov 27, 2017
    Configuration menu
    Copy the full SHA
    79c61fd View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2017

  1. Update README.md

    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    a83cbe4 View commit details
    Browse the repository at this point in the history

  2. testing context

    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    986a019 View commit details
    Browse the repository at this point in the history

  3. fix typo

    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    ba595d6 View commit details
    Browse the repository at this point in the history

  4. remove test

    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    51bbea3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request pinax#513 from blueyed/plan-per-account-upstream 

    Add UniquePerAccountStripeObject for Plans
    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    55704ae View commit details
    Browse the repository at this point in the history

  6. Merge pull request pinax#500 from blueyed/fix-AccountApplicationDeaut… 

    …horizeWebhook-validate-without-account

Fix AccountApplicationDeauthorizeWebhook for non-account events
    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    6766a04 View commit details
    Browse the repository at this point in the history

  7. Merge pull request pinax#515 from blueyed/charge-outcome-upstream 

    Add Charge.outcome
    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    257a9f2 View commit details
    Browse the repository at this point in the history

  8. Merge pull request pinax#526 from blueyed/charge-repr-pk-upstream 

    Charge: add pk to __repr__
    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    dd87314 View commit details
    Browse the repository at this point in the history

  9. Merge pull request pinax#518 from blueyed/AdminTestCase 

    AdminTestCase: use setUpClass for fixtures
    @paltman
    paltman authored Dec 1, 2017
    Configuration menu
    Copy the full SHA
    4013376 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. Merge remote-tracking branch 'origin/master' into merge-master 

    Conflicts:
	pinax/stripe/migrations/0011_rename_account_transfers_payout.py
	pinax/stripe/migrations/0013_charge_outcome.py
	pinax/stripe/tests/test_webhooks.py
	pinax/stripe/webhooks.py
    @blueyed
    blueyed committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    3158330 View commit details
    Browse the repository at this point in the history