Commit graph

11,426 commits

Author SHA1 Message Date
Javier Donadío
a4f4c993da Merge pull request #6887 from Gamboster/fix/missingVariableWalletService
Fix: missing variable in wallet service
2017-10-11 17:31:48 -03:00
Gabriel Masclef
2bef3033b1
Fix: missing variable in wallet service 2017-10-11 17:22:10 -03:00
Javier Donadío
d243017fd6 Merge pull request #6874 from cmgustavo/feat/split-coin-receive
Receive: wallets separated by coins
2017-10-10 10:53:09 -03:00
Javier Donadío
58ece11379 Merge pull request #6878 from cmgustavo/translations/update-15
Update translations PO
2017-10-10 10:21:17 -03:00
Gustavo Maximiliano Cortez
53cadd350a
Update translations PO 2017-10-10 09:59:39 -03:00
Gustavo Maximiliano Cortez
56beae3270
Removes title in some cases 2017-10-10 09:41:32 -03:00
Javier Donadío
8402f84579 Merge pull request #6871 from cmgustavo/bug/meli-texts-01
Bug/meli texts 01
2017-10-10 09:35:55 -03:00
Gustavo Maximiliano Cortez
9d3e93b12a
Receive: wallets separated by coins 2017-10-09 16:55:21 -03:00
Gustavo Maximiliano Cortez
790cfcfdd4
Updates pot template 2017-10-09 11:31:52 -03:00
Gustavo Maximiliano Cortez
da81282143
MeLi: Fix typos 2017-10-09 11:30:01 -03:00
Javier Donadío
7571a7b248 Merge pull request #6859 from cmgustavo/translations/update-14
Updates POT
2017-10-06 12:45:24 -03:00
Javier Donadío
05ab1dddeb Merge pull request #6860 from matiu/build/chrome
add default to chrome target
2017-10-06 10:31:52 -03:00
Matias Alejo Garcia
ee51ed0e01 add default to chrome target 2017-10-06 10:13:49 -03:00
Gustavo Maximiliano Cortez
c85dff1481
Updates POT 2017-10-06 09:35:20 -03:00
Javier Donadío
00b1e8c85d Merge pull request #6856 from cmgustavo/feat/split-wallet-type
Feat/split wallets (bitcoin and bitcoin cash)
2017-10-05 17:33:32 -03:00
Gustavo Maximiliano Cortez
df557bf874
Split wallets from settings 2017-10-05 17:13:26 -03:00
Gustavo Maximiliano Cortez
aad87b149d
Add icons 2017-10-05 15:40:43 -03:00
Gustavo Maximiliano Cortez
a853c17a0d
Split wallets by type (bitcoin and bitcoin cash) 2017-10-05 15:18:30 -03:00
Matias Alejo Garcia
cc403fe034 Merge pull request #6843 from cmgustavo/translations/update-13
Updates POT file
2017-10-02 16:24:43 -03:00
Gabriel Edgardo Bazán
d047e5aa37 Merge pull request #6842 from cmgustavo/feat/dutch-language-01
Adds dutch language
2017-10-02 15:19:56 -03:00
Gustavo Maximiliano Cortez
ee01403f03
Updates POT file 2017-10-02 14:57:46 -03:00
Gustavo Maximiliano Cortez
b5ceca32a9
Fix typo 2017-10-02 14:52:58 -03:00
Gustavo Maximiliano Cortez
7968c0097a
Adds dutch language 2017-10-02 14:50:44 -03:00
Matias Alejo Garcia
9dcd9e7e6b Merge pull request #6790 from cmgustavo/bug/cash-legacy-address-01
Bug/bitcoin cash legacy address
2017-10-02 14:07:14 -03:00
Gustavo Maximiliano Cortez
287ecba7ff
Rename variables 2017-10-02 12:40:44 -03:00
Gustavo Maximiliano Cortez
2e541f90ad
Clean code 2017-10-02 12:37:33 -03:00
Gustavo Maximiliano Cortez
a5948b7b3c
Removes cash message 2017-10-02 12:36:00 -03:00
Gustavo Maximiliano Cortez
49199997e3
Ref try catch for networkName 2017-10-02 12:35:08 -03:00
Matias Alejo Garcia
1323934652 Merge pull request #6840 from cmgustavo/bug/ui-walletDetails-01
Fix walletDetails view when error occurs
2017-10-02 12:19:41 -03:00
Gustavo Maximiliano Cortez
d4679d6408
Fix walletDetails view when error occurs 2017-10-02 12:01:20 -03:00
Gustavo Maximiliano Cortez
9e3d1b9e8f Merge pull request #6839 from matiu/bug/xpriv-log
Bug/xpriv log
2017-10-02 11:54:00 -03:00
Matias Alejo Garcia
dec57d366e ignore npm lock 2017-10-02 11:34:49 -03:00
Gustavo Maximiliano Cortez
bd4e4bb0c0 Merge pull request #6814 from gabrielbazan7/fix/importBCHPk
fix import BCH wallet from private key
2017-10-02 11:21:35 -03:00
Matias Alejo Garcia
acb0d176f2 hide xpriv in certain cases in the log 2017-10-02 11:19:03 -03:00
Gustavo Maximiliano Cortez
8119295f0e Merge pull request #6821 from gabrielbazan7/fix/windowsIcons1
Windows Phone: icons fix (1)
2017-10-02 11:16:49 -03:00
Gustavo Maximiliano Cortez
ab9d3e3ced Merge pull request #6777 from gabrielbazan7/ref/prefCash
add scan option and remove button
2017-10-02 11:15:59 -03:00
Matias Alejo Garcia
0486d4a086 Merge pull request #6838 from cmgustavo/bug/wallet-color-icons-01
Fix icon and wallet color from settings view
2017-10-02 10:11:22 -03:00
Gustavo Maximiliano Cortez
d3c09e8ccf
Fix icon and wallet color from settings view 2017-10-02 10:04:28 -03:00
Gabriel Bazán
16dbf78de8 fix wp icons 2017-09-29 15:17:14 -03:00
Gabriel Bazán
a271a34041 fix import BCH wallet from private key 2017-09-29 11:16:52 -03:00
Javier Donadío
de398bc47b Merge pull request #6813 from cmgustavo/bug/meli-translations-02
Bug/meli translations 02
2017-09-29 10:27:15 -03:00
Gustavo Maximiliano Cortez
ef928c41d4
Fix typo 2017-09-29 10:22:34 -03:00
Gustavo Maximiliano Cortez
4f57239c33
MeLi: Fix translations 02 2017-09-29 10:19:25 -03:00
Javier Donadío
4165630fd6 Merge pull request #6802 from cmgustavo/bug/meli-texts-01
MeLi: Update translations. Fix icon
2017-09-28 09:52:48 -03:00
Gustavo Maximiliano Cortez
39f7d96f9a
MeLi: Update translations. Fix icon 2017-09-27 15:46:09 -03:00
Gustavo Maximiliano Cortez
846321ae4e
Fix names 2017-09-26 17:06:05 -03:00
Gustavo Maximiliano Cortez
5e0b5c876b
Fix confirm view for bitcoin cash legacy address 2017-09-26 17:03:07 -03:00
Gabriel Bazán
1ff072da9d add scan option and remove button 2017-09-22 10:46:48 -03:00
Matias Alejo Garcia
e486568708 Merge pull request #6771 from JDonadio/ref/duplicate-bch-wallet
Fix bch view and bch backup message
2017-09-21 12:51:05 -03:00
JDonadio
341be3cef0
fix text note 2017-09-21 12:36:49 -03:00