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

[WIP/RFC] integration branch review #440

Open
wants to merge 294 commits into
base: original
Choose a base branch
from
Open

[WIP/RFC] integration branch review #440

wants to merge 294 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 19, 2017

  1. Merge pull request #10 from ticosax/refactor-user-account 

    Account foreign key
    @ticosax
    ticosax authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    3ca711e View commit details
    Browse the repository at this point in the history

  2. tests: factor out InvoiceSyncsTests

    @blueyed
    blueyed committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    586aea5 View commit details
    Browse the repository at this point in the history

  3. sync_invoice_from_stripe_data: use stripe_account

    @blueyed
    blueyed committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    3deef74 View commit details
    Browse the repository at this point in the history

  4. replace the fields

    @ticosax
    ticosax committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    308ff3a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #12 from ticosax/fix-migration 

    replace the fields
    @ticosax
    ticosax authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    fd2cad4 View commit details
    Browse the repository at this point in the history

  6. CircleCI: test merge commit 

    Ref: pinax#415

Source: https://discuss.circleci.com/t/show-test-results-for-prospective-merge-of-a-github-pr/1662/14
    @blueyed
    blueyed committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    d5080ab View commit details
    Browse the repository at this point in the history

  7. Merge branch 'cci-test-merge-commit' into next

    @blueyed
    blueyed committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    884adc3 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #11 from blueyed/invoice-charge-connect-next 

    sync_invoice_from_stripe_data: use stripe_account
    @blueyed
    blueyed authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    b9aaf49 View commit details
    Browse the repository at this point in the history

  9. Enhance admin with connect search

    @ticosax
    ticosax committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    81e4777 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #13 from ticosax/admin-connect 

    Enhance admin with connect search
    @ticosax
    ticosax authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    06ec62c View commit details
    Browse the repository at this point in the history

  11. remove UserAccount.account

    @ticosax
    ticosax committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    4707135 View commit details
    Browse the repository at this point in the history

  12. Migration

    @ticosax
    ticosax committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    9336338 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #14 from ticosax/remove-user-accounts-m2m 

    Remove UserAccount.account
    @ticosax
    ticosax authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    1f140ad View commit details
    Browse the repository at this point in the history

  14. Add additional tests

    @ticosax
    ticosax committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    cfd7a69 View commit details
    Browse the repository at this point in the history

  15. Log what is happening around customer creation

    @ticosax
    ticosax committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    98b1126 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #15 from ticosax/add-test 

    Add test
    @ticosax
    ticosax authored Oct 19, 2017
    Configuration menu
    Copy the full SHA
    561b700 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2017

  1. Bring back UserAccount.account

    @ticosax
    ticosax committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    d3b55dd View commit details
    Browse the repository at this point in the history

  2. Our fork doesn't need templates

    @ticosax
    ticosax committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    68b5fbc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #16 from ticosax/bring-backuser-account.account 

    Bring back UserAccount.account
    @ticosax
    ticosax authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    3405b44 View commit details
    Browse the repository at this point in the history

  4. fix Isort

    @ticosax
    ticosax committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    18394fe View commit details
    Browse the repository at this point in the history

  5. Merge pull request #17 from ticosax/remove-template 

    Our fork doesn't need templates
    @ticosax
    ticosax authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    401769e View commit details
    Browse the repository at this point in the history

  6. for consistency

    @ticosax
    ticosax committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    2bdd84f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #18 from ticosax/remove-also-customer-in-mig 

    remove also customes in migraiton for consistency
    @ticosax
    ticosax authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    2fa5a7a View commit details
    Browse the repository at this point in the history

  8. fixup! remove UserAccount.account

    @blueyed
    blueyed committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    4ba29ad View commit details
    Browse the repository at this point in the history

  9. Merge branch 'fix-CustomerUpdatedWebhook-with-no-customer' into next

    @blueyed
    blueyed committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    9ef6b68 View commit details
    Browse the repository at this point in the history

  10. fixup! Enhance admin with connect search

    @blueyed
    blueyed committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    b222b58 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	.circleci/config.yml
	tox.ini
    @blueyed
    blueyed committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    45927a9 View commit details
    Browse the repository at this point in the history

  12. fixup! Adjust CircleCI config: only build dj111/master (dj20)

    @blueyed
    blueyed committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    5148d11 View commit details
    Browse the repository at this point in the history

  13. fixup! Adjust CircleCI config: only build dj111/master (dj20)

    @blueyed
    blueyed committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    1624ced View commit details
    Browse the repository at this point in the history

  14. Merge pull request #21 from blueyed/merge-upstream 

    Merge upstream
    @blueyed
    blueyed authored Oct 20, 2017
    Configuration menu
    Copy the full SHA
    1a8f550 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2017

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

    Conflicts:
	.circleci/config.yml
    @blueyed
    blueyed committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    57c25b1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from blueyed/merge 

    Merge upstream
    @blueyed
    blueyed authored Oct 23, 2017
    Configuration menu
    Copy the full SHA
    68598b1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'setup-pytest' into next 

    Conflicts:
	setup.cfg
    @blueyed
    blueyed committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    87750fc View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2017

  1. Add discount objects (#19) 

    * Add discount objects

* Add coupon webhook handlers

* Change Coupon id unique-togetherness
    @pkolios
    pkolios authored Oct 24, 2017
    Configuration menu
    Copy the full SHA
    deb1f74 View commit details
    Browse the repository at this point in the history

  2. tox: add postgres factor to use PostgreSQL for tests

    @blueyed
    blueyed committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    480409e View commit details
    Browse the repository at this point in the history

  3. CircleCI: add py36dj20psql

    @blueyed
    blueyed committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    441d17e View commit details
    Browse the repository at this point in the history

  4. tests: fix/improve test_sync_invoice_items_updating

    @blueyed
    blueyed committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    e943f19 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #22 from blueyed/tests-psql-next 

    Test against psql
    @blueyed
    blueyed authored Oct 24, 2017
    Configuration menu
    Copy the full SHA
    3626d12 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'account-publishable_key' into next

    @blueyed
    blueyed committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    f0172f1 View commit details
    Browse the repository at this point in the history

  7. Revert "Merge branch 'account-publishable_key' into next" 

    This reverts commit f0172f1, reversing
changes made to 3626d12.
    @blueyed
    blueyed committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    57ca13a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #25 from blueyed/revert-stripe_publishable_key 

    Revert "Merge branch 'account-publishable_key' into next"
    @blueyed
    blueyed authored Oct 24, 2017
    Configuration menu
    Copy the full SHA
    7881f72 View commit details
    Browse the repository at this point in the history

  9. fixup! CircleCI: test merge commit

    @blueyed
    blueyed committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    424e34c View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. Merge branch 'master' into next 

    Conflicts:
	pinax/stripe/admin.py
	pinax/stripe/tests/test_webhooks.py
	tox.ini
    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    71b5cf3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'merge-migrations' into next

    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    830f00e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'improve-test_customer_admin-captured' into next

    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    7d89006 View commit details
    Browse the repository at this point in the history

  4. Add merge migration

    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    117cbbb View commit details
    Browse the repository at this point in the history

  5. CircleCI: only run lint, py36dj111psql and py36dj20psql

    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    08de707 View commit details
    Browse the repository at this point in the history

  6. fixup! CircleCI: only run lint, py36dj111psql and py36dj20psql

    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    82217dd View commit details
    Browse the repository at this point in the history

  7. fixup! fixup! CircleCI: only run lint, py36dj111psql and py36dj20psql

    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    89ae284 View commit details
    Browse the repository at this point in the history

  8. fixup! fixup! fixup! CircleCI: only run lint, py36dj111psql and py36d… 

    …j20psql
    @blueyed
    blueyed committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    c5e148b View commit details
    Browse the repository at this point in the history

  9. Bring back account.stripe_publishable_key

    @ticosax
    ticosax committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    da3fc39 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #28 from ticosax/account-pub-key 

    Bring back account.stripe_publishable_key
    @ticosax
    ticosax authored Oct 25, 2017
    Configuration menu
    Copy the full SHA
    42553f5 View commit details
    Browse the repository at this point in the history

  11. Handle account.application.deauthorized event

    @ticosax
    ticosax committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    5666324 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #26 from ticosax/account.application.deauthorized 

    [RFC] Handle account.application.deauthorized event
    @ticosax
    ticosax authored Oct 25, 2017
    Configuration menu
    Copy the full SHA
    4252d75 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2017

  1. That's our model we need to update

    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    41bfb6f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #29 from ticosax/deauthorized-canot-fetch 

    That's our model we need to update
    @ticosax
    ticosax authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    2dc2700 View commit details
    Browse the repository at this point in the history

  3. Pass stripe account while subscribe

    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    f8195ff View commit details
    Browse the repository at this point in the history

  4. Merge pull request #30 from ticosax/sub-connect 

    Pass stripe account while subscribe
    @ticosax
    ticosax authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    c15668e View commit details
    Browse the repository at this point in the history

  5. Explain which parameter we expect

    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    0df4b53 View commit details
    Browse the repository at this point in the history

  6. Update charges.py

    @blueyed
    blueyed authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    3d4a8fe View commit details
    Browse the repository at this point in the history

  7. Merge pull request #31 from ticosax/better-doc 

    Explain which parameter we expect
    @ticosax
    ticosax authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    cf739b4 View commit details
    Browse the repository at this point in the history

  8. Make Subscriptions Account Related

    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    49b6a22 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #32 from ticosax/sub-account-aware 

    Make Subscriptions Account Related
    @blueyed
    blueyed authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    4b13057 View commit details
    Browse the repository at this point in the history

  10. Fix processing of account.application.deauthorized events 

    don't try to fetch the event as we lost access to remote account
    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    5ed86af View commit details
    Browse the repository at this point in the history

  11. Merge pull request #33 from ticosax/signal-account-deauthorize 

    Fix processing of account.application.deauthorized events
    @ticosax
    ticosax authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    22be75b View commit details
    Browse the repository at this point in the history

  12. c962eaf

    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    cd979b2 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #34 from ticosax/typo 

    c962eaf
    @ticosax
    ticosax authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    868dfa2 View commit details
    Browse the repository at this point in the history

  14. This might happen if account has already been removed locally

    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    d489328 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #35 from ticosax/handle-already-deleted-account 

    This might happen if account has already been removed locally
    @ticosax
    ticosax authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    cc870a7 View commit details
    Browse the repository at this point in the history

  16. Use real-life fixture

    @ticosax
    ticosax committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    17471bf View commit details
    Browse the repository at this point in the history

  17. Merge pull request #36 from ticosax/upgrae-fixture 

    Use real-life fixture
    @ticosax
    ticosax authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    56da19d View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2017

  1. Retrieve connected subscription

    @ticosax
    ticosax committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    4ac323c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #38 from ticosax/retrive-sub-with-account 

    Retrieve connected subscription
    @ticosax
    ticosax authored Oct 27, 2017
    Configuration menu
    Copy the full SHA
    7ac5f40 View commit details
    Browse the repository at this point in the history

  3. Fix connected Charges

    @ticosax
    ticosax committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    cfe6575 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #39 from ticosax/fix-connected-invoice-retrieve 

    Fix connected Charges
    @ticosax
    ticosax authored Oct 27, 2017
    Configuration menu
    Copy the full SHA
    d423767 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'account-foregin-key' into improve-account-models 

    Conflicts:
	pinax/stripe/models.py
	pinax/stripe/tests/test_actions.py
	pinax/stripe/tests/test_webhooks.py
	pinax/stripe/webhooks.py
    @blueyed
    blueyed committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    a3515f9 View commit details
    Browse the repository at this point in the history

  6. merge migrations

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

  7. We probably need to pass the stripe account

    @ticosax
    ticosax committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    a434a96 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #41 from ticosax/charges-account-aware 

    We probably need to pass the stripe account
    @ticosax
    ticosax authored Oct 27, 2017
    Configuration menu
    Copy the full SHA
    d93e0f5 View commit details
    Browse the repository at this point in the history

  9. Not quite there yet

    @ticosax
    ticosax committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    a0c5c1d View commit details
    Browse the repository at this point in the history

  10. Merge pull request #42 from ticosax/charges-account-aware 

    Not quite there yet
    @ticosax
    ticosax authored Oct 27, 2017
    Configuration menu
    Copy the full SHA
    3648a35 View commit details
    Browse the repository at this point in the history

  11. actions.charges.create: commit hotfix from prod

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

  12. fixup! actions.charges.create: commit hotfix from prod

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

Commits on Oct 30, 2017

  1. Merge pull request #40 from blueyed/improve-account-models 

    Improve account models (for next)
    @blueyed
    blueyed authored Oct 30, 2017
    Configuration menu
    Copy the full SHA
    af4eb23 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'account-foregin-key' into next

    @blueyed
    blueyed committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    888303a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into next

    @blueyed
    blueyed committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    277bf0d View commit details
    Browse the repository at this point in the history

  4. Revert "Merge pull request #25 from blueyed/revert-stripe_publishable… 

    …_key"

This reverts commit 7881f72, reversing
changes made to f0172f1.
    @blueyed
    blueyed committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    7bee473 View commit details
    Browse the repository at this point in the history

  5. Merge migrations

    @blueyed
    blueyed committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    3f7dc39 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2017

  1. Attempt to solve migration conflict

    @ticosax
    ticosax committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    ac40f67 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #44 from ticosax/merge-master 

    Merge master
    @ticosax
    ticosax authored Nov 1, 2017
    Configuration menu
    Copy the full SHA
    ec993ef View commit details
    Browse the repository at this point in the history

  3. Allow to pass idempotency key to create charges

    @ticosax
    ticosax committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    6a2c05d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #45 from ticosax/idempotency_key 

    Allow to pass idempotency key to create charges
    @ticosax
    ticosax authored Nov 1, 2017
    Configuration menu
    Copy the full SHA
    4ed3d24 View commit details
    Browse the repository at this point in the history

  5. rely on stripe_account_stripe_id when possible

    @ticosax
    ticosax committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    db11438 View commit details
    Browse the repository at this point in the history

  6. Fix retrieve connected subscription

    @ticosax
    ticosax committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    0ecdb8c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #47 from ticosax/replace-getattr 

    rely on stripe_account_stripe_id when possible
    @ticosax
    ticosax authored Nov 1, 2017
    Configuration menu
    Copy the full SHA
    c3c938c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'fix-actions-charge' into next-fix-actions-charge 

    Conflicts:
	pinax/stripe/actions/charges.py
    @blueyed
    blueyed committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    755c00a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'revert-merge-commit' into next-revert-merge-commit

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

  10. Merge pull request #48 from blueyed/next-revert-merge-commit 

    Next: revert testing against merge commit
    @blueyed
    blueyed authored Nov 1, 2017
    Configuration menu
    Copy the full SHA
    07c17c5 View commit details
    Browse the repository at this point in the history

  11. Adjust tests for idempotency_key/stripe_account

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

  12. Merge pull request #46 from ticosax/cancel-subscription 

    Fix retrieve connected subscription
    @ticosax
    ticosax authored Nov 1, 2017
    Configuration menu
    Copy the full SHA
    96976d9 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #49 from blueyed/next-fix-actions-charge 

    Next: fix actions.charges.create
    @blueyed
    blueyed authored Nov 1, 2017
    Configuration menu
    Copy the full SHA
    eb2a055 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2017

  1. Merge branch 'sub-actions-return' into next 

    Conflicts:
	pinax/stripe/tests/test_actions.py
    @blueyed
    blueyed committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    7a9c8b7 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2017

  1. Subscription: use StripeAccountFromCustomerMixin

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

Commits on Nov 6, 2017

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

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

  2. Merge pull request #51 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Nov 6, 2017
    Configuration menu
    Copy the full SHA
    5665c58 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #50 from blueyed/sub-StripeAccountFromCustomerMixin 

    Subscription: use StripeAccountFromCustomerMixin
    @blueyed
    blueyed authored Nov 6, 2017
    Configuration menu
    Copy the full SHA
    fbaef15 View commit details
    Browse the repository at this point in the history

  4. Fix UserAccount for py2 (#53) 

    > ValueError: @python_2_unicode_compatible cannot be applied to
> UserAccount because it doesn't define __str__().
    @blueyed
    blueyed authored Nov 6, 2017
    Configuration menu
    Copy the full SHA
    5775984 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into next 

    Conflicts:
	pinax/stripe/actions/customers.py
	pinax/stripe/models.py
	pinax/stripe/tests/test_actions.py
	pinax/stripe/tests/test_models.py
	pinax/stripe/tests/test_webhooks.py
	pinax/stripe/webhooks.py
    @blueyed
    blueyed committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    4651943 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. Merge pull request #54 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Nov 7, 2017
    Configuration menu
    Copy the full SHA
    37cc5c0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'charge-capture' into charges-next

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

  3. Merge branch 'charge-repr' into charges-next

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

  4. Retrieve customer with stripe account

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

  5. Merge pull request #56 from ticosax/retrieve-customer 

    Retrieve customer with stripe account
    @ticosax
    ticosax authored Nov 7, 2017
    Configuration menu
    Copy the full SHA
    d5fdf5f View commit details
    Browse the repository at this point in the history

  6. Align with master

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

  7. Merge pull request #57 from ticosax/align-with-master 

    Align with master
    @ticosax
    ticosax authored Nov 7, 2017
    Configuration menu
    Copy the full SHA
    ec10549 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #55 from blueyed/charges-next 

    Charges improvements for next
    @blueyed
    blueyed authored Nov 7, 2017
    Configuration menu
    Copy the full SHA
    f750739 View commit details
    Browse the repository at this point in the history

  9. prevent one excessive join

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

  10. Merge pull request #58 from ticosax/amendment 

    prevent one excessive join
    @ticosax
    ticosax authored Nov 7, 2017
    Configuration menu
    Copy the full SHA
    64f48d9 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'fix-sync_subscription_from_stripe_data' into fix-sync_s… 

    …ubscription_from_stripe_data-next

Conflicts:
	pinax/stripe/tests/test_actions.py
    @blueyed
    blueyed committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    27afb9b View commit details
    Browse the repository at this point in the history

  12. Merge pull request #59 from blueyed/fix-sync_subscription_from_stripe… 

    …_data-next

Fix sync subscription from stripe data next
    @blueyed
    blueyed authored Nov 7, 2017
    Configuration menu
    Copy the full SHA
    581a9a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

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

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

  2. migrations: remove merging of already merged migrations

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

  3. Merge pull request #60 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Nov 8, 2017
    Configuration menu
    Copy the full SHA
    7bf4d20 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2017

  1. minor: align whitespace around EventsTests with master

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

  2. Merge branch 'user-account' into user-account-next 

    Conflicts:
	pinax/stripe/actions/customers.py
	pinax/stripe/models.py
	pinax/stripe/tests/test_actions.py
    @blueyed
    blueyed committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    2420d3d View commit details
    Browse the repository at this point in the history

  3. Remove already applied migration

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

  4. next: fix CustomersTests

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

Commits on Nov 14, 2017

  1. next: revert on_behalf_of/stripe_account hack (#62)

    @blueyed
    blueyed authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    63ac683 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61 from blueyed/user-account-next 

    user-account for next
    @blueyed
    blueyed authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    bd7488b View commit details
    Browse the repository at this point in the history

  3. Squash migrations: 0010_connect_squashed_0026_merge_20171106_2259 (#64)

    @blueyed
    blueyed authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    feb75b4 View commit details
    Browse the repository at this point in the history

  4. Already provided with AccountListFilter

    @ticosax
    ticosax committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    fd6eba4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #66 from ticosax/remove-redundant-search 

    Already provided with AccountListFilter
    @ticosax
    ticosax authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    f4857f6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into merge-master 

    # Conflicts:
#	pinax/stripe/webhooks.py
    @ticosax
    ticosax committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    78a6400 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #67 from ticosax/merge-master 

    Merge master
    @ticosax
    ticosax authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    2987eeb View commit details
    Browse the repository at this point in the history

  8. Probably a leftover of conflict solving

    @ticosax
    ticosax committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    4a99a0e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #68 from ticosax/fix-conflict-resolution 

    Probably a leftover of conflict solving
    @ticosax
    ticosax authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    aac5f98 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2017

  1. Merge branch 'master' into merge-master

    @ticosax
    ticosax committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    186063f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #69 from ticosax/merge-master 

    Merge master
    @ticosax
    ticosax authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    f2f7fe7 View commit details
    Browse the repository at this point in the history

  3. delete unnecessary diff with master

    @ticosax
    ticosax committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    ea6ad0d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #70 from ticosax/reduce-noise 

    delete unnecessary diff with master
    @ticosax
    ticosax authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    71dcff9 View commit details
    Browse the repository at this point in the history

  5. AccountsSyncTestCase: use setUpClass

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

  6. AccountsSyncTestCase: sort not_custom_account_data fixture

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

  7. AccountsSyncTestCase: fix/update not_custom_account_data fixture 

    "transfers_enabled" is not in there by default?!
Might only be there after/when rejecting an account
(https://stripe.com/docs/api#reject_account).

Adding "payouts_enabled" and "support_address".
    @blueyed
    blueyed committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    8d87055 View commit details
    Browse the repository at this point in the history

  8. sync_account_from_stripe_data: only set attributes that are in data

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

  9. Merge branch 'fix-sync-account' into fix-sync-account-next

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

  10. please mccabe

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

  11. Merge pull request #71 from blueyed/fix-sync-account-next 

    Fix sync account next
    @blueyed
    blueyed authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    ffd20dc View commit details
    Browse the repository at this point in the history

  12. Retrieve Charge for capture with account

    @ticosax
    ticosax committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    936198e View commit details
    Browse the repository at this point in the history

  13. Merge pull request #72 from ticosax/capture-connect 

    Retrieve Charge for capture with account
    @ticosax
    ticosax authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    74a1a4d View commit details
    Browse the repository at this point in the history

  14. Make customer repr account aware

    @ticosax
    ticosax committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    312dca7 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #65 from ticosax/admin-user-account-customer 

    Make customer repr account aware
    @ticosax
    ticosax authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    6cfae5d View commit details
    Browse the repository at this point in the history

  16. Rename fields per stripe version 2017-04-06

    @ticosax
    ticosax committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    193b641 View commit details
    Browse the repository at this point in the history

  17. Migrations

    @ticosax
    ticosax committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    3e9c726 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'admin-account-display_name' into admin-account-display_… 

    …name-next
    @blueyed
    blueyed committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    f6b88c8 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #74 from blueyed/admin-account-display_name-next 

    Admin account display name next
    @ticosax
    ticosax authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    a02fa01 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #73 from ticosax/rename-field-accounts-next 

    Rename field accounts next
    @ticosax
    ticosax authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    af4cb9c View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2017

  1. Fix AccountApplicationDeauthorizeWebhook for non-account events

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

  2. Merge pull request #75 from blueyed/fix-AccountApplicationDeauthorize… 

    …Webhook-validate-without-account-next

Fix AccountApplicationDeauthorizeWebhook for non-account events
    @blueyed
    blueyed authored Nov 16, 2017
    Configuration menu
    Copy the full SHA
    1c01c22 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	pinax/stripe/migrations/0011_account_publishable_key.py
	pinax/stripe/migrations/0012_user_account.py
	pinax/stripe/migrations/0017_merge_20171106_2201.py
	pinax/stripe/migrations/0019_merge_20171025_1519.py
	pinax/stripe/migrations/0021_account-authorized.py
	pinax/stripe/migrations/0026_merge_20171106_2259.py
    @blueyed
    blueyed committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    4b2b26a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #77 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Nov 16, 2017
    Configuration menu
    Copy the full SHA
    ad818b7 View commit details
    Browse the repository at this point in the history

  5. actions.subscriptions.cancel: skip GET 

    Skip retrieving the Stripe subscription object when deleting it.
    @blueyed
    blueyed committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    d831abb View commit details
    Browse the repository at this point in the history

  6. cleanup

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

  7. Merge pull request #79 from blueyed/next-sub-cancel-lazy 

    next: actions.subscriptions.cancel: skip GET
    @blueyed
    blueyed authored Nov 16, 2017
    Configuration menu
    Copy the full SHA
    bafe8ba View commit details
    Browse the repository at this point in the history

  8. Merge branch 'admin-classes' into next-admin-classes-2 

    Conflicts:
	pinax/stripe/admin.py
    @blueyed
    blueyed committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    8abbecd View commit details
    Browse the repository at this point in the history

  9. Merge pull request #80 from blueyed/next-admin-classes-2 

    Next admin classes
    @blueyed
    blueyed authored Nov 16, 2017
    Configuration menu
    Copy the full SHA
    b68bfe0 View commit details
    Browse the repository at this point in the history

  10. Fixup subscriptions.cancel (#81)

    @blueyed
    blueyed authored Nov 16, 2017
    Configuration menu
    Copy the full SHA
    0d3c2f2 View commit details
    Browse the repository at this point in the history

  11. admin: list_select_related+=stripe_account

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

  12. Merge pull request #82 from blueyed/admin-select_related-stripe_account 

    admin: list_select_related+=stripe_account
    @blueyed
    blueyed authored Nov 16, 2017
    Configuration menu
    Copy the full SHA
    b10dcf0 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2017

  1. account.application.deauthorized: remove ValueError 

    The account might still be accessible, e.g. if it was connected multiple
times.
    @blueyed
    blueyed committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    2c521b4 View commit details
    Browse the repository at this point in the history

  2. Cleanup migrations

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

  3. Merge pull request #83 from blueyed/deauthorize-no-valueerror 

    account.application.deauthorized: remove ValueError
    @blueyed
    blueyed authored Nov 17, 2017
    Configuration menu
    Copy the full SHA
    9f727b9 View commit details
    Browse the repository at this point in the history

  4. fixup! Cleanup migrations

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

Commits on Nov 20, 2017

  1. Add Coupon.stripe_coupon

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

  2. sync_coupon_from_stripe_data: handle livemode

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

  3. Merge pull request #85 from blueyed/coupon-stripe_coupon-next 

    Add Coupon.stripe_coupon
    @blueyed
    blueyed authored Nov 20, 2017
    Configuration menu
    Copy the full SHA
    6826caa View commit details
    Browse the repository at this point in the history

  4. Merge pull request #86 from blueyed/fix-sync_coupon_from_stripe_data 

    sync_coupon_from_stripe_data: handle livemode
    @blueyed
    blueyed authored Nov 20, 2017
    Configuration menu
    Copy the full SHA
    9952de6 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2017

  1. Add UniquePerAccountSripeObject 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 21, 2017
    Configuration menu
    Copy the full SHA
    aa28475 View commit details
    Browse the repository at this point in the history

  2. merge migrations

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

  3. Use UniquePerAccountStripeObject for Coupon

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

  4. fixup! Add UniquePerAccountSripeObject for Plans

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

  5. Merge pull request #84 from blueyed/cleanup-migrations 

    Cleanup migrations
    @blueyed
    blueyed authored Nov 21, 2017
    Configuration menu
    Copy the full SHA
    c546d5e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #87 from blueyed/plan-per-account 

    Add UniquePerAccountSripeObject for Plans
    @blueyed
    blueyed authored Nov 21, 2017
    Configuration menu
    Copy the full SHA
    b6642a3 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2017

  1. Add Plan.stripe_plan property

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

  2. Merge pull request #88 from blueyed/plan-stripe_plan 

    Add Plan.stripe_plan property
    @blueyed
    blueyed authored Nov 22, 2017
    Configuration menu
    Copy the full SHA
    cf7a40b View commit details
    Browse the repository at this point in the history

  3. Add Charge.outcome

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

  4. Add Makefile to help with migrations (#90)

    @blueyed
    blueyed authored Nov 22, 2017
    Configuration menu
    Copy the full SHA
    975b9f3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #89 from blueyed/charge-outcome 

    Add Charge.outcome
    @blueyed
    blueyed authored Nov 22, 2017
    Configuration menu
    Copy the full SHA
    9128571 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2017

  1. fixup! Add Plan.stripe_plan property

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

  2. Merge pull request #91 from blueyed/fix-stripe_plan-without_account 

    fixup! Add Plan.stripe_plan property
    @blueyed
    blueyed authored Nov 23, 2017
    Configuration menu
    Copy the full SHA
    1385772 View commit details
    Browse the repository at this point in the history

  3. CircleCI: add s/py36dj111psql/py27dj111

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

  4. next: merge Discount.__str__ from coupons PR 

    (required for py27)
    @blueyed
    blueyed committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    63dc455 View commit details
    Browse the repository at this point in the history

  5. merge more py27 fixes from PRs

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

  6. Merge pull request #93 from blueyed/next-py27 

    next: fix/test py27
    @blueyed
    blueyed authored Nov 23, 2017
    Configuration menu
    Copy the full SHA
    9101456 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	pinax/stripe/tests/test_models.py
    @blueyed
    blueyed committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    51d2991 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #94 from blueyed/merge-master 

    Merge master
    @ticosax
    ticosax authored Nov 23, 2017
    Configuration menu
    Copy the full SHA
    a7940c7 View commit details
    Browse the repository at this point in the history

  9. models: use blank=True with null=True 

    Fixes pinax#474.
    @blueyed
    blueyed committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    ff89411 View commit details
    Browse the repository at this point in the history

  10. migration

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

  11. Merge pull request #92 from blueyed/blank 

    models: blank with null
    @blueyed
    blueyed authored Nov 23, 2017
    Configuration menu
    Copy the full SHA
    6c74ba8 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2017

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

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

  2. Remove duplicate migration from ticosax/rename-fields-account

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

  3. AccountAdmin: fix search_fields

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

  4. Merge branch 'AdminTestCase' into merge-master

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

  5. Merge pull request #95 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Nov 24, 2017
    Configuration menu
    Copy the full SHA
    d3b0d7b View commit details
    Browse the repository at this point in the history

  6. CircleCI: remove py36dj111psql (#96)

    @blueyed
    blueyed authored Nov 24, 2017
    Configuration menu
    Copy the full SHA
    f94a10d View commit details
    Browse the repository at this point in the history

  7. Add ChargeAdmin, prefetching users (#97)

    @blueyed
    blueyed authored Nov 24, 2017
    Configuration menu
    Copy the full SHA
    83a3855 View commit details
    Browse the repository at this point in the history

  8. CustomerAdmin: use __str__, select/prefetch user/users

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

  9. Merge pull request #98 from blueyed/improve-CustomerAdmin 

    CustomerAdmin: use __str__, select/prefetch user/users
    @blueyed
    blueyed authored Nov 24, 2017
    Configuration menu
    Copy the full SHA
    3d8c5b7 View commit details
    Browse the repository at this point in the history

  10. Customer.__repr__: use list for users

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

Commits on Nov 27, 2017

  1. Merge pull request #99 from blueyed/customer-users-list 

    Customer.__repr__: use list for users
    @blueyed
    blueyed authored Nov 27, 2017
    Configuration menu
    Copy the full SHA
    de63b2a View commit details
    Browse the repository at this point in the history

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

    Adds pinax/stripe/migrations/0015_blank_account_legal_entity_dob.py.

Conflicts:
	pinax/stripe/migrations/0014_blank_with_null.py
	pinax/stripe/models.py
	pinax/stripe/tests/test_models.py
    @blueyed
    blueyed committed Nov 27, 2017
    Configuration menu
    Copy the full SHA
    af22710 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #100 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Nov 27, 2017
    Configuration menu
    Copy the full SHA
    6d3dc53 View commit details
    Browse the repository at this point in the history

  4. Charge: add pk to __repr__

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

  5. Coupon.__repr__: add pk

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

  6. Merge pull request #101 from blueyed/charge-repr-pk 

    Charge: add pk to __repr__
    @blueyed
    blueyed authored Nov 27, 2017
    Configuration menu
    Copy the full SHA
    ddfaaaa View commit details
    Browse the repository at this point in the history

  7. Merge pull request #102 from blueyed/coupon-repr-pk 

    Coupon.__repr__: add pk
    @blueyed
    blueyed authored Nov 27, 2017
    Configuration menu
    Copy the full SHA
    838afa6 View commit details
    Browse the repository at this point in the history

  8. Cleanup admin: do not allow to add/change objects 

    Fixes pinax#527
    @blueyed
    blueyed committed Nov 27, 2017
    Configuration menu
    Copy the full SHA
    1394bfc View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2017

  1. Merge pull request #103 from blueyed/adm 

    Cleanup admin: do not allow to add/change objects
    @blueyed
    blueyed authored Nov 28, 2017
    Configuration menu
    Copy the full SHA
    8951ff6 View commit details
    Browse the repository at this point in the history

  2. ChargeAdmin: list_display: add outcome (type/risk_level)

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

  3. Merge pull request #104 from blueyed/chargeadmin-outcome 

    ChargeAdmin: list_display: add outcome (type/risk_level)
    @blueyed
    blueyed authored Nov 28, 2017
    Configuration menu
    Copy the full SHA
    9ce027c View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	setup.cfg
    @blueyed
    blueyed committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    65fbab3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'merge-master' into next 

    Closes #105
    @blueyed
    blueyed committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    9f943a8 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2017

  1. admin: fix ModelAdmin: only disallow POST

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

  2. Merge pull request #106 from blueyed/fix-admin-readonly 

    admin: fix ModelAdmin: only disallow POST
    @blueyed
    blueyed authored Nov 29, 2017
    Configuration menu
    Copy the full SHA
    cd002cb 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

  2. link_customer: create missing customers 

    This also fixes some event fixtures.

Fixes pinax#467.
    @blueyed
    blueyed committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    7fecca1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #107 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Dec 4, 2017
    Configuration menu
    Copy the full SHA
    ffee579 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2017

  1. Merge pull request #108 from blueyed/link-non-existing-customer-next 

    link_customer: create missing customers
    @blueyed
    blueyed authored Dec 5, 2017
    Configuration menu
    Copy the full SHA
    a380070 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Charge: add __str__ and total_amount property (#109)

    @blueyed
    blueyed authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    789cdf5 View commit details
    Browse the repository at this point in the history

  2. admin: add stripe_account_stripe_id/stripe_account (#111)

    @blueyed
    blueyed authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    e19023c View commit details
    Browse the repository at this point in the history

  3. Charge admin: use total amount in list_display (#110)

    @blueyed
    blueyed authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    df3aa3e View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Customer: fix __str__ for saved customer without users (#112)

    @blueyed
    blueyed authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    f8dac91 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. Fix squashed migration (#113) 

    This removes he following from
0010_connect_squashed_0026_merge_20171106_2259's `replaces`:

    ('pinax_stripe', '0025_remove_subscription_stripe_account'),
    ('pinax_stripe', '0016_auto_20171106_1234'),
    ('pinax_stripe', '0014_auto_20171026_1304'),
    ('pinax_stripe', '0017_merge_20171106_2201'),
    ('pinax_stripe', '0026_merge_20171106_2259'),

It was necessary for me to get the
0010_connect_squashed_0026_merge_20171106_2259 migration to be
recognized when in the following state (`manage.py showmigrations`):

    [X] 0010_connect
    [X] 0011_rename_account_transfers_payout
    [X] 0011_auto_20171121_1648
    [X] 0012_merge_20171121_1652
    [X] 0013_charge_outcome
    [ ] 0014_blank_with_null
    [ ] 0015_blank_account_legal_entity_dob
    @blueyed
    blueyed authored Feb 19, 2018
    Configuration menu
    Copy the full SHA
    c9f6284 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2018

  1. install_requires: unpin jsonfield (#114) 

    Ref pinax#542
    @blueyed
    blueyed authored Feb 20, 2018
    Configuration menu
    Copy the full SHA
    f33a61c View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

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

    Conflicts:
	.circleci/config.yml
	pinax/stripe/admin.py
    @blueyed
    blueyed committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    05c3847 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #115 from blueyed/merge 

    Merge master into next
    @blueyed
    blueyed authored Mar 14, 2018
    Configuration menu
    Copy the full SHA
    a6b7d9e View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2018

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

    @blueyed
    blueyed committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    50e1c11 View commit details
    Browse the repository at this point in the history

  2. Merge migrations

    @blueyed
    blueyed committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    4ce2ae1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #116 from blueyed/merge 

    Merge upstream
    @blueyed
    blueyed authored Apr 16, 2018
    Configuration menu
    Copy the full SHA
    31b0c8a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. Support stripe-python 2.0

    @blueyed
    blueyed committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    81d5127 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #117 from blueyed/stripe20 

    Support stripe-python 2.0
    @blueyed
    blueyed authored Jul 11, 2018
    Configuration menu
    Copy the full SHA
    1b00401 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

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

    Conflicts:
	pinax/stripe/actions/coupons.py
	pinax/stripe/tests/test_actions.py
    @blueyed
    blueyed committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    6249b28 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #118 from blueyed/merge-master 

    Merge master
    @blueyed
    blueyed authored Aug 28, 2018
    Configuration menu
    Copy the full SHA
    f808df7 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2018

  1. user_search_fields: include users 

    This is required with users through connected accounts.
    @blueyed
    blueyed committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    949241c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #119 from blueyed/user_search_fields 

    user_search_fields: include users
    @blueyed
    blueyed authored Sep 5, 2018
    Configuration menu
    Copy the full SHA
    b8a6dd2 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2018

  1. Fix ChargeWebhook for charge.dispute events 

    Fixes pinax#590
    @blueyed
    blueyed committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    c31c77b View commit details
    Browse the repository at this point in the history

  2. CircleCI: use postgres user 

    "root" is not available anymore?!

Ref: https://circleci.com/gh/lock8/pinax-stripe/1256
    @blueyed
    blueyed committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    d3243da View commit details
    Browse the repository at this point in the history

  3. Merge pull request #120 from blueyed/ChargeDisputeWebhook 

    Fix ChargeWebhook for charge.dispute events
    @blueyed
    blueyed authored Sep 13, 2018
    Configuration menu
    Copy the full SHA
    a791604 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2021

  1. increased stripe_publishable_key data length for new stripe api keys

    @shanedevane
    shanedevane committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    8657aa2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #123 from lock8/increase_column_length 

    increased stripe_publishable_key data length for new stripe api keys
    @shanedevane
    shanedevane authored Aug 16, 2021
    Configuration menu
    Copy the full SHA
    50e846e View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. Unblock Django 2.2 patch version upgrade

    @bwh1te
    bwh1te authored Apr 22, 2022
    Configuration menu
    Copy the full SHA
    05f988d View commit details
    Browse the repository at this point in the history