Commit graph

2,318 commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez
ed5bf07c5f
Fix bitpay-card pairing with 2fa 2016-10-24 09:23:39 -03:00
Gustavo Maximiliano Cortez
ad9c840ac7
Fix show contacts from tx proposals and tx views 2016-10-23 19:15:08 -03:00
Matias Alejo Garcia
641091e7d9 Revert "Scan handling" 2016-10-22 23:28:24 -03:00
Matias Alejo Garcia
8f46973240 Merge pull request #648 from msalcala11/txDetailStyling
Better transaction detail view styling
2016-10-22 21:52:17 -03:00
Javier
f7624bcc9b fix routes and params 2016-10-22 17:43:05 -03:00
Matias Alejo Garcia
3a7e45bab1 Merge pull request #649 from cmgustavo/bug/bitpay-card-tx-list
Ref BitPay Card TX list
2016-10-22 07:20:40 -03:00
Gustavo Maximiliano Cortez
15c20f38ac
Ref BitPay Card TX list 2016-10-21 20:33:28 -03:00
Marty Alcala
92c64fe353 a little cleanup 2016-10-21 19:13:14 -04:00
Marty Alcala
83cdc77e35 use new txp-detail view from activity 2016-10-21 19:04:18 -04:00
Marty Alcala
d30aeff411 add view on blockchain button 2016-10-21 18:40:37 -04:00
Marty Alcala
e5742e82f7 add proposal timeline 2016-10-21 18:06:51 -04:00
Matias Alejo Garcia
414cc8b6aa Merge pull request #647 from cmgustavo/bug/copayers-invitation-button
Fix invitation button from copayers view
2016-10-21 18:46:12 -03:00
Matias Alejo Garcia
16c0c58d32 Merge pull request #618 from msalcala11/scanHandling
Scan handling
2016-10-21 18:45:58 -03:00
Marty Alcala
f8f56544ae wire alternative amount 2016-10-21 17:20:46 -04:00
Marty Alcala
ade2fb1c80 get memos working 2016-10-21 17:16:35 -04:00
Marty Alcala
298956f97f prelim remake of tx detail view 2016-10-21 16:56:19 -04:00
Gustavo Maximiliano Cortez
f3d7103923
Fix invitation button from copayer views 2016-10-21 15:24:37 -03:00
Ivan Socolsky
93caee3ca7
allow send when amount > 0 2016-10-21 15:12:03 -03:00
Matias Alejo Garcia
c689d4eb13 Merge pull request #635 from cmgustavo/bug/wallet-details-tx-list
Preload the address book on wallet-details
2016-10-21 14:06:32 -03:00
Marty Alcala
a0e4c9d3f8 cleanup 2016-10-21 11:54:47 -04:00
Marty Alcala
2fb99dd7c1 use ui-router non-url params for paypro 2016-10-21 11:53:04 -04:00
Marty Alcala
2492337600 remove console.log 2016-10-21 11:22:38 -04:00
Marty Alcala
7f7df63234 cleanup 2016-10-21 11:21:28 -04:00
Marty Alcala
360e1c8f87 fix paypro scan handling 2016-10-21 11:10:01 -04:00
Gustavo Maximiliano Cortez
53977ac00e
Replaces directive by an object of addressbook on walletDetails 2016-10-21 11:58:33 -03:00
Gabriel Bazán
680179356d fix settings 2016-10-21 11:47:32 -03:00
Marty Alcala
3f402fbd89 fix merge conflicts 2016-10-21 09:38:27 -04:00
Matias Alejo Garcia
de248d5639 Merge pull request #615 from JDonadio/feat/timer-confirm-paypro
Display paypro timer on confirm view
2016-10-21 09:31:39 -03:00
Jason Dreyzehner
fb154b2ac3 feat(send): polish send view 2016-10-21 03:48:41 -04:00
Jason Dreyzehner
3266391fcf fix(card): clarify language on card add confirmation dialog 2016-10-21 00:13:22 -04:00
Jason Dreyzehner
ffa8aa39ce feat(card): polish design of bitpay card intro view 2016-10-21 00:04:15 -04:00
Jason Dreyzehner
41831bbb9d fix(card): update bitpay card intro links 2016-10-20 18:58:48 -04:00
Marty Alcala
15830a861b cleanup 2016-10-20 18:04:45 -04:00
Marty Alcala
468850f9fb fix backwards compatible qr code paypro scan 2016-10-20 17:55:06 -04:00
Marty Alcala
41e1d99609 Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into scanHandling 2016-10-20 16:46:54 -04:00
Marty Alcala
70294d6fa1 don't show incoming data menu when data is pasted into the send view 2016-10-20 16:37:47 -04:00
Javier
7e03fdad0b fix spinner after slide to pay 2016-10-20 16:44:44 -03:00
Javier
d7ebc96097 fix error popup 2016-10-20 16:11:36 -03:00
Javier
c8330b4cd4 display paypro timer on confirm view 2016-10-20 15:38:57 -03:00
Marty Alcala
78c9ac2484 prelim logic to conditionally display incoming data menu based on the source 2016-10-20 12:53:35 -04:00
Jamal Jackson
d9f8501b8f changed or operator to ternary operator 2016-10-20 10:35:18 -04:00
Jamal Jackson
d2ca85a036 minor update to how value is set 2016-10-20 10:15:27 -04:00
Jamal Jackson
6ee9fbe77c redefined logic to use wallet name only if not present alias available 2016-10-20 09:51:35 -04:00
Matias Alejo Garcia
781604da90 Merge pull request #598 from jamal-jackson/feature/wallet_preferences_name_change
disabled save button for name change until value is different than st…
2016-10-20 07:14:13 -03:00
Gustavo Maximiliano Cortez
38681ae4b0 Merge pull request #597 from JDonadio/fix/timeline
Fix timeline order
2016-10-20 01:09:00 -03:00
Gustavo Maximiliano Cortez
a09eade648 Merge pull request #599 from jamal-jackson/feature/preload_wallet_settings
preload settings toggle values
2016-10-20 01:08:07 -03:00
Marty Alcala
890dadade0 remove unused deps 2016-10-19 16:52:55 -04:00
Marty Alcala
01da9d91e4 cleanup 2016-10-19 16:45:29 -04:00
Marty Alcala
01d5e1d2eb Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into scanHandling 2016-10-19 16:36:32 -04:00
Marty Alcala
27f8c08488 better alignment of incoming data menu 2016-10-19 16:30:36 -04:00