Commit graph

10,719 commits

Author SHA1 Message Date
Javier Donadío
f0dbbd0960 Merge pull request #60 from matiu/bug/starting
Bug/starting
2017-04-18 17:29:38 -03:00
Matias Alejo Garcia
43f04d4296
fix starting 2017-04-18 17:19:11 -03:00
Matias Alejo Garcia
9f41a8b79a
logs 2017-04-18 16:42:25 -03:00
JDonadio
8be28e85da refactor 2017-04-18 16:42:15 -03:00
Javier Donadío
163a45a5a0 Merge pull request #59 from matiu/x
refactor routes
2017-04-18 11:27:46 -03:00
Matias Alejo Garcia
bb7186db69
refactor routes 2017-04-18 11:18:00 -03:00
JDonadio
ef0addc29d fix config.lock options by default 2017-04-18 11:01:33 -03:00
Javier Donadío
f75b43f21e Merge pull request #5895 from gabrielbazan7/translations/updatepo
update template po
2017-04-17 16:05:31 -03:00
Gabriel Bazán
38b95eba7a update pot 2017-04-17 15:56:26 -03:00
Javier Donadío
c958cc5f00 Merge pull request #5894 from cmgustavo/release/v3.1.0
New release v3.1.0
2017-04-17 15:51:19 -03:00
Gustavo Maximiliano Cortez
aa56a61f48
New release v3.1.0 2017-04-17 15:30:44 -03:00
Gustavo Maximiliano Cortez
294673e703 Merge pull request #5892 from gabrielbazan7/fix/tab-receive
fix bug when changing selector too fast
2017-04-17 15:01:49 -03:00
Gabriel Edgardo Bazán
bfe12f7e32 Merge pull request #5890 from cmgustavo/feat/improves-top-up
Feat/Enable SendMax
2017-04-17 19:34:56 +02:00
Javier Donadío
37533704dc Merge pull request #5884 from gabrielbazan7/bug/set-wallet-properly
set wallet properly when side wallets screen is activated
2017-04-17 14:16:10 -03:00
Javier Donadío
5f6158fa40 Merge pull request #5877 from gabrielbazan7/fix/feelevels
fix get fee levels function
2017-04-17 14:09:15 -03:00
Javier Donadío
803a9ca365 Merge pull request #5797 from ajp8164/feat/intel-tee
Baseline Intel TEE support
2017-04-17 13:57:25 -03:00
Gabriel Bazán
4c4a14d068 fix bug when changing selector too fast 2017-04-17 12:30:49 -03:00
Andy Phillipson
a742e53814 Review and test fixes. 2017-04-17 10:55:16 -04:00
Javier Donadío
70f780010a Merge pull request #5889 from cmgustavo/bug/card-unknown-merchant
Adds Unknown Merchant if merchant.name is empty
2017-04-17 10:00:06 -03:00
Gustavo Maximiliano Cortez
4f4f0b417b
Clean useSendMax variable 2017-04-16 22:29:17 -03:00
Gustavo Maximiliano Cortez
28ef9a22dc
Enable SendMax to top up debit card 2017-04-16 22:23:37 -03:00
Gustavo Maximiliano Cortez
00e1d30296
Adds Unknown Merchant if merchant.name is empty 2017-04-16 20:42:48 -03:00
Matias Alejo Garcia
c9bad23b20 Merge pull request #5875 from JDonadio/feat/low-fee-warning
Feat/Add warning for low fee
2017-04-14 20:54:50 +02:00
Gabriel Bazán
0a3cc34e61 low fee warning on wallet details view 2017-04-14 15:11:43 -03:00
JDonadio
5e7956ca6e add warning for low fee 2017-04-14 15:11:43 -03:00
Gabriel Bazán
1ab252535d fix for no wallets 2017-04-14 12:49:22 -03:00
Gabriel Bazán
bafdb6c8d0 set wallet properly when side wallets screen is activated 2017-04-14 12:40:08 -03:00
Gabriel Edgardo Bazán
d521e031a1 Merge pull request #5883 from matiu/bug/amazon-retry
Bug/amazon retry
2017-04-14 15:38:57 +02:00
Matias Alejo Garcia
b7165e22f3
rm logs 2017-04-14 10:15:27 -03:00
Matias Alejo Garcia
dd1209a92c
handle the "invalid" status 2017-04-13 16:58:42 -03:00
Gabriel Bazán
005c5c3aae fix get fee levels function 2017-04-13 16:12:36 -03:00
Javier Donadío
6e0ad4dafc Merge pull request #5864 from gabrielbazan7/fix/backbutton
changing ionic to version 1.3.3 with the backbutton fix
2017-04-13 10:22:47 -03:00
Gabriel Bazán
a26d27132c changing ionic to version 1.3.3 with the backbutton fix 2017-04-13 10:12:21 -03:00
Matias Alejo Garcia
5f197b5f4e Merge pull request #5853 from JDonadio/fix/parsing-paypro
Use BIP21 params if paypro info is not complete
2017-04-12 16:03:05 +02:00
Gabrielbazan7
36cb23015a Bug fixes - retest intel tee. 2017-04-11 10:02:14 -04:00
Andy Phillipson
413990f94c Bug fixes - ledger testing 2017-04-11 10:02:14 -04:00
Andy Phillipson
c0e90ac21a Revert BWS version. 2017-04-11 10:02:14 -04:00
Gabrielbazan7
7acd2331f7 Update external hardware preferences view. 2017-04-11 10:02:14 -04:00
Andy Phillipson
80f3b70784 Implement intel tee version detection. 2017-04-11 10:02:14 -04:00
Gabrielbazan7
8c00fe27aa Bug fixes after rebase.
Please enter the commit message for your changes. Lines starting
2017-04-11 10:02:14 -04:00
Andy Phillipson
e6d997a701 Provide address object to intel tee service to display address securely. 2017-04-11 10:02:14 -04:00
Andy Phillipson
2153d9b468 Fix hw descriptions. 2017-04-11 10:02:14 -04:00
Andy Phillipson
80d2b7bc01 Detect Windows platform for TEE. 2017-04-11 10:02:14 -04:00
Andy Phillipson
8d63fa3507 Improve detection of supported hw wallets. 2017-04-11 10:02:14 -04:00
Andy Phillipson
0c69dfb061 Initial Intel TEE integration. 2017-04-11 10:02:14 -04:00
Javier Donadío
62cc46e455 Merge pull request #5872 from matiu/bug/gift-card-err
better gift-card-err
2017-04-10 13:48:07 -03:00
Matias Alejo Garcia
acd91e01e6
better gift-card-err 2017-04-10 13:37:57 -03:00
Matias Alejo Garcia
bca0475642 Merge pull request #5863 from JDonadio/fix/resume-locked
Fix resume event navigation
2017-04-07 15:57:50 +02:00
JDonadio
d25e28f20a fix resume event navigation 2017-04-07 10:46:54 -03:00
Javier Donadío
3a029ab9c3 Merge pull request #5858 from gabrielbazan7/fix/redirect
fixing desktop redirect from starting to home view
2017-04-06 17:33:49 -03:00