Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Coinbase #2053

Closed
wants to merge 39 commits into from
Closed

Coinbase #2053

wants to merge 39 commits into from

Commits on Feb 17, 2014

  1. Update profile style

    @kyungmin
    kyungmin committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    7149657 View commit details
    Browse the repository at this point in the history

  2. Connect to balanced.js for Coinbase integration

    @kyungmin
    kyungmin committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    1ec3fd4 View commit details
    Browse the repository at this point in the history

  3. Show dialog only if no payment method is set

    @kyungmin
    kyungmin committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    b095f89 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2014

  1. Add connected accounts

    @kyungmin
    kyungmin committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    39a03ef View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'matthewfl/balanced-rev1.1' into coinbase

    @kyungmin
    kyungmin committed Feb 18, 2014
    Configuration menu
    Copy the full SHA
    a858b01 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2014

  1. Connect to coinbase

    @kyungmin
    kyungmin committed Feb 20, 2014
    6 Configuration menu
    Copy the full SHA
    3929484 View commit details
    Browse the repository at this point in the history

  2. Update payment message

    @kyungmin
    kyungmin committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    7f4151f View commit details
    Browse the repository at this point in the history

  3. Regroup accounts elsewhere for #2053 

    Per comment at
#2052 (comment)
    @chadwhitacre
    chadwhitacre committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    39dd8b9 View commit details
    Browse the repository at this point in the history

  4. Switch order of Venmo and Bitcoin 

    I suspect bitcoin is the more popular one-off method of the two, in
addition to being alphabetically first.
    @chadwhitacre
    chadwhitacre committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    1397901 View commit details
    Browse the repository at this point in the history

  5. Tweak a couple template includes 

    Reflowing, minor verbiage.
    @chadwhitacre
    chadwhitacre committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    7eca20d View commit details
    Browse the repository at this point in the history

  6. Take out promo note about Coinbase

    @chadwhitacre
    chadwhitacre committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    9c0d311 View commit details
    Browse the repository at this point in the history

  7. Pop gift amount on focus

    @chadwhitacre
    chadwhitacre committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    4858bb4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into coinbase

    @chadwhitacre
    chadwhitacre committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    0e26cf1 View commit details
    Browse the repository at this point in the history

  9. start to coinbase on the backend, not tested or working yet

    @matthewfl
    matthewfl committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    98a6569 View commit details
    Browse the repository at this point in the history

  10. Fix button size and restore edit button

    @kyungmin
    kyungmin committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    ffd174b View commit details
    Browse the repository at this point in the history

  11. Fix input field and button style for the giving page

    @kyungmin
    kyungmin committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    6b2b45d View commit details
    Browse the repository at this point in the history

  12. Revert back changes made out of scope

    @kyungmin
    kyungmin committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    6d7ae45 View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'origin/coinbase' into coinbase-backend

    @matthewfl
    matthewfl committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    211d6cb View commit details
    Browse the repository at this point in the history

  14. adding coinbase to payday

    @matthewfl
    matthewfl committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    30356dc View commit details
    Browse the repository at this point in the history

  15. moving db migration in branch.sql thanks to the info from @zwn

    @matthewfl
    matthewfl committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    c9bb09f View commit details
    Browse the repository at this point in the history

  16. add more vendor files

    @matthewfl
    matthewfl committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    0c0a66d View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2014

  1. Connect/disconnect coinbase from gittip account

    @kyungmin
    kyungmin committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    0098c8d View commit details
    Browse the repository at this point in the history

  2. Require deleting coinbase to add credit card

    @kyungmin
    kyungmin committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    44628a7 View commit details
    Browse the repository at this point in the history

  3. Make payment method dialog buttons large

    @kyungmin
    kyungmin committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    01b6994 View commit details
    Browse the repository at this point in the history

  4. Disable Add link if credit card is connected

    @kyungmin
    kyungmin committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    cecb027 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2014

  1. some issues with balanced backend getting fixed atm

    @matthewfl
    matthewfl committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    4b4875c View commit details
    Browse the repository at this point in the history

  2. Fix edit bitcoin address

    @kyungmin
    kyungmin committed Feb 22, 2014
    1 Configuration menu
    Copy the full SHA
    b41e913 View commit details
    Browse the repository at this point in the history

  3. tests working with external account

    @matthewfl
    matthewfl committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    445e0e0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'coinbase-backend' into coinbase

    @matthewfl
    matthewfl committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    feb798a View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	gittip/billing/__init__.py
	templates/connected-accounts.html
	tests/fixtures/TestPaydayCharge.yml
	tests/test_billing.py
	tests/test_billing_payday.py
	www/bank-account.html.spt
    @matthewfl
    matthewfl committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    0b96b4b View commit details
    Browse the repository at this point in the history

  6. fixing last issues with merge

    @matthewfl
    matthewfl committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    96179d2 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2014

  1. Integrate with the latest backend and add confirmation messages

    @kyungmin
    kyungmin committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    644baab View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2014

  1. Fix test failure

    @kyungmin
    kyungmin committed Feb 25, 2014
    1 Configuration menu
    Copy the full SHA
    6681e2b View commit details
    Browse the repository at this point in the history

  2. Minor fix

    @kyungmin
    kyungmin committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    17165c1 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2014

  1. Resolved merge conflict. (Needs some CSS fixes)

    @kyungmin
    kyungmin committed Mar 1, 2014
    Configuration menu
    Copy the full SHA
    c00b183 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2014

  1. Update connected accounts table

    @kyungmin
    kyungmin committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    665fb58 View commit details
    Browse the repository at this point in the history

  2. Resolve merge conflict

    @kyungmin
    kyungmin committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    d8846e5 View commit details
    Browse the repository at this point in the history

  3. Re-apply changes

    @kyungmin
    kyungmin committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    8f8a56e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'coinbase' of https://github.com/gittip/www.gittip.com i… 

    …nto coinbase
    @kyungmin
    kyungmin committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    ad2c654 View commit details
    Browse the repository at this point in the history