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
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7149657
Update profile style
kyungmin Feb 17, 2014
1ec3fd4
Connect to balanced.js for Coinbase integration
kyungmin Feb 17, 2014
b095f89
Show dialog only if no payment method is set
kyungmin Feb 17, 2014
39a03ef
Add connected accounts
kyungmin Feb 18, 2014
a858b01
Merge remote-tracking branch 'matthewfl/balanced-rev1.1' into coinbase
kyungmin Feb 18, 2014
3929484
Connect to coinbase
kyungmin Feb 20, 2014
7f4151f
Update payment message
kyungmin Feb 20, 2014
39dd8b9
Regroup accounts elsewhere for #2053
chadwhitacre Feb 20, 2014
1397901
Switch order of Venmo and Bitcoin
chadwhitacre Feb 20, 2014
7eca20d
Tweak a couple template includes
chadwhitacre Feb 20, 2014
9c0d311
Take out promo note about Coinbase
chadwhitacre Feb 20, 2014
4858bb4
Pop gift amount on focus
chadwhitacre Feb 20, 2014
0e26cf1
Merge branch 'master' into coinbase
chadwhitacre Feb 20, 2014
98a6569
start to coinbase on the backend, not tested or working yet
matthewfl Feb 20, 2014
ffd174b
Fix button size and restore edit button
kyungmin Feb 20, 2014
6b2b45d
Fix input field and button style for the giving page
kyungmin Feb 20, 2014
6d7ae45
Revert back changes made out of scope
kyungmin Feb 20, 2014
211d6cb
Merge remote-tracking branch 'origin/coinbase' into coinbase-backend
matthewfl Feb 20, 2014
30356dc
adding coinbase to payday
matthewfl Feb 20, 2014
c9bb09f
moving db migration in branch.sql thanks to the info from @zwn
matthewfl Feb 20, 2014
0c0a66d
add more vendor files
matthewfl Feb 20, 2014
0098c8d
Connect/disconnect coinbase from gittip account
kyungmin Feb 21, 2014
44628a7
Require deleting coinbase to add credit card
kyungmin Feb 21, 2014
01b6994
Make payment method dialog buttons large
kyungmin Feb 21, 2014
cecb027
Disable Add link if credit card is connected
kyungmin Feb 21, 2014
4b4875c
some issues with balanced backend getting fixed atm
matthewfl Feb 22, 2014
b41e913
Fix edit bitcoin address
kyungmin Feb 22, 2014
445e0e0
tests working with external account
matthewfl Feb 22, 2014
feb798a
Merge branch 'coinbase-backend' into coinbase
matthewfl Feb 22, 2014
0b96b4b
Merge remote-tracking branch 'origin/master' into coinbase
matthewfl Feb 22, 2014
96179d2
fixing last issues with merge
matthewfl Feb 22, 2014
644baab
Integrate with the latest backend and add confirmation messages
kyungmin Feb 24, 2014
6681e2b
Fix test failure
kyungmin Feb 25, 2014
17165c1
Minor fix
kyungmin Feb 25, 2014
c00b183
Resolved merge conflict. (Needs some CSS fixes)
kyungmin Mar 1, 2014
665fb58
Update connected accounts table
kyungmin Mar 5, 2014
d8846e5
Resolve merge conflict
kyungmin Mar 5, 2014
8f8a56e
Re-apply changes
kyungmin Mar 5, 2014
ad2c654
Merge branch 'coinbase' of https://github.com/gittip/www.gittip.com i…
kyungmin Mar 5, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into coinbase
chadwhitacre committed Feb 20, 2014
commit 0e26cf1258d2a02986f384c13a6b9ac314b1a5ef

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.