Commit graph

2,343 commits

Author SHA1 Message Date
Marty Alcala
d4513ba46b fix merge conflicts 2016-10-27 11:44:03 -04:00
Matias Alejo Garcia
070ce0470a Merge pull request #4930 from gabrielbazan7/fix/nextSteps
fix next steps
2016-10-27 12:35:56 -03:00
Gabriel Bazán
c5bc1006a9 refactor 2016-10-27 12:31:28 -03:00
Matias Alejo Garcia
9dde74e5cb Merge pull request #4903 from jamal-jackson/feature/send_view_flicker_fix
fix flicker issue
2016-10-27 12:13:34 -03:00
Matias Alejo Garcia
72f3a79457 Merge pull request #4902 from gabrielbazan7/feat/newRealeases
new releases
2016-10-27 11:58:06 -03:00
Gabriel Bazán
038a4413d0 fix next steps 2016-10-27 11:45:38 -03:00
Gustavo Maximiliano Cortez
194ff49ef8 Merge pull request #4914 from gabrielbazan7/fix/alertMessage
fix alert messages
2016-10-27 10:23:11 -03:00
Marty Alcala
ccd2870c51 pause preview when handling paypro from scanner 2016-10-26 17:27:25 -04:00
Marty Alcala
291326ad0a treat paypro as a non-url param 2016-10-26 17:21:44 -04:00
Gabriel Bazán
f6806fcdf3 fix alert messages 2016-10-26 17:12:25 -03:00
Marty Alcala
0e5f342198 a little cleanup 2016-10-26 16:09:21 -04:00
Marty Alcala
c0c08eeb59 fetch paypro details before navigating to confirm view for a topup 2016-10-26 16:03:20 -04:00
Marty Alcala
ffeb8ad612 ensure rate limit errors are handled properly 2016-10-26 15:02:14 -04:00
Marty Alcala
08711f1f07 move getPayProDetails method to its own service 2016-10-26 14:36:28 -04:00
Marty Alcala
22d4a92f7d Revert "Revert "Scan handling""
This reverts commit 641091e7d9.
2016-10-26 14:00:43 -04:00
Gustavo Maximiliano Cortez
384201841b Merge pull request #4898 from gabrielbazan7/ref/backupNeeded
remove to show backup needed modal automatically when clicking on receive view
2016-10-26 14:31:08 -03:00
Jamal Jackson
a7c1a3ddd3 fix flicker issue 2016-10-26 13:28:08 -04:00
Gabriel Bazán
7fc0bb6fb2 new releases 2016-10-26 12:56:33 -03:00
Gabriel Bazán
b82136adf1 fixes 2016-10-26 12:03:55 -03:00
Gabriel Bazán
497a68705a remove to show backup needed modal automatically when clicking on receive view 2016-10-26 11:53:48 -03:00
Javier
ba2d60cfe0 fix warning message on confirm view 2016-10-26 11:20:57 -03:00
Jason Dreyzehner
f4041f6dbc Merge branch 'master' of github.com:bitpay/copay into bitpay 2016-10-25 17:45:01 -04:00
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