Jon Layton
|
75c1b17681
|
Post-merge fixups, runs, doesnt connect
|
2018-03-05 20:04:28 -06:00 |
|
Jon Layton
|
0ca9fc8391
|
Merge remote-tracking branch 'up/master' into HEAD
|
2018-03-05 19:40:10 -06:00 |
Johann Bauer
|
4c81a77ccc
|
Revert "Check if value has 'is_nan' before calling it"
This reverts commit 1451c66a8f.
|
2018-03-05 23:24:12 +01:00 |
|
Johann Bauer
|
1451c66a8f
|
Check if value has 'is_nan' before calling it
Fixes: #4034
|
2018-03-05 23:07:52 +01:00 |
SomberNight
|
2fdbfa6b81
|
wizard: rename option to "use a master key"
|
2018-03-05 12:58:03 +01:00 |
脇山P
|
122cb08dc6
|
Add JPY exchange rate (#4016)
|
2018-03-05 12:08:10 +01:00 |
|
SomberNight
|
81666bf9ac
|
fix #4026
|
2018-03-05 11:44:03 +01:00 |
ThomasV
|
0bca97dd2f
|
improve fee status message
|
2018-03-05 09:49:17 +01:00 |
|
SomberNight
|
219ea6588b
|
update default server list
|
2018-03-05 06:00:24 +01:00 |
|
SomberNight
|
81b6d65764
|
refactor network constants
|
2018-03-04 22:10:59 +01:00 |
|
ThomasV
|
1526768cd6
|
kivy: simplify history screen, display either fiat or btc
|
2018-03-03 11:32:38 +01:00 |
|
Jon Layton
|
0669a8d236
|
Increment version to 1.0.5
|
2018-03-02 23:48:14 -06:00 |
|
SomberNight
|
0df6d1ec97
|
trezor: segwit offline signing
|
2018-03-03 02:39:49 +01:00 |
|
SomberNight
|
7816edc342
|
fix #4003
|
2018-03-03 00:05:57 +01:00 |
|
ThomasV
|
4b7cf297f5
|
fix #3998
|
2018-03-02 18:00:05 +01:00 |
|
SomberNight
|
02f2e5c599
|
wallet.add_transaction: adding to spent_outpoints, out of order case
|
2018-03-02 07:56:17 +01:00 |
|
ThomasV
|
9f5c76bf0b
|
Merge pull request #3995 from SomberNight/toggle_history_tab_capgains
toggle capital gains columns in qt history tab
|
2018-03-02 06:52:27 +01:00 |
|
Jon Layton
|
24809dc7e7
|
Fix explorers, add coinmarketcap, readme instructions
|
2018-03-01 13:32:48 -06:00 |
|
ThomasV
|
968862076f
|
fix sign
|
2018-03-01 19:09:24 +01:00 |
|
SomberNight
|
724ed874aa
|
toggle capital gains columns in qt history tab
|
2018-03-01 19:05:51 +01:00 |
|
ThomasV
|
37e43d9c10
|
follow up prev commit
|
2018-03-01 18:31:16 +01:00 |
|
ThomasV
|
fb761b7c12
|
request fee historgam every minute. show fee in the send tab of kivy gui
|
2018-03-01 18:28:54 +01:00 |
|
ThomasV
|
4236adc552
|
fix date filtering
|
2018-02-28 09:50:28 +01:00 |
|
SomberNight
|
a821a3504e
|
wizard: remove unused strings
|
2018-02-27 16:52:28 +01:00 |
|
ThomasV
|
a3554dc2b7
|
fix #3963
|
2018-02-27 16:00:56 +01:00 |
|
ThomasV
|
51630416fc
|
fix expenditures sign
|
2018-02-27 15:26:39 +01:00 |
|
ThomasV
|
31edc419fa
|
improve get_tx_status
|
2018-02-27 15:13:44 +01:00 |
|
ThomasV
|
afd39b2f42
|
Merge branch 'master' of github.com:spesmilo/electrum
|
2018-02-27 12:19:54 +01:00 |
|
ThomasV
|
c50d758c3e
|
rename "Local only" as "Local"
|
2018-02-27 12:17:02 +01:00 |
Yuki Inoue
|
6687c1b336
|
daemon returns true only if the wallet is loaded
|
2018-02-27 18:43:00 +09:00 |
|
ThomasV
|
375d7965d7
|
Merge pull request #3978 from SomberNight/load_unverified_tx_offline
prepare self.unverified_tx regardless of network
|
2018-02-27 00:52:24 +01:00 |
|
ThomasV
|
03b40a3c0a
|
Merge pull request #3514 from SomberNight/2fa_testnet
make 2fa wallets work on testnet
|
2018-02-27 00:50:09 +01:00 |
|
SomberNight
|
3daa8b018f
|
prepare self.unverified_tx regardless of network
|
2018-02-26 19:45:20 +01:00 |
|
SomberNight
|
a32d27b9d7
|
make 2fa wallets work on testnet
|
2018-02-26 18:21:36 +01:00 |
|
ThomasV
|
22daffbbea
|
fix typo
|
2018-02-26 18:16:33 +01:00 |
|
ThomasV
|
aad0e276c0
|
wallet history: compute income and expenditures, remove redundant calculation of acquisition price
|
2018-02-26 18:13:39 +01:00 |
|
ThomasV
|
9fe24e32c0
|
test for NaN in Fiat.__str__
|
2018-02-26 18:04:44 +01:00 |
|
Jon Layton
|
cf5af8c0a1
|
Increment version to 1.0.4
|
2018-02-25 19:19:09 -06:00 |
|
Jon Layton
|
65f53b081d
|
Add electrum.zclassic.org:5222
|
2018-02-25 19:16:26 -06:00 |
|
SomberNight
|
649b5a7298
|
fix #3964
|
2018-02-24 22:37:03 +01:00 |
|
SomberNight
|
f1b7578218
|
fix #3960
|
2018-02-24 00:30:40 +01:00 |
|
SomberNight
|
55a0a6b7f0
|
fix #3962
|
2018-02-24 00:14:34 +01:00 |
|
ThomasV
|
050f9b7d3a
|
Merge branch 'master' into zbar_windows
|
2018-02-23 16:04:34 +01:00 |
|
ThomasV
|
0fbcb8229b
|
Merge pull request #3882 from SomberNight/storage_hw_encrypt_cli_support
cli support for hw encrypted wallets
|
2018-02-23 12:07:08 +01:00 |
|
ThomasV
|
18ba4319da
|
Merge pull request #3951 from SomberNight/file_import_export_unification
File import-export unification
|
2018-02-23 11:46:04 +01:00 |
|
ThomasV
|
aaf89d2325
|
fix #3858
|
2018-02-23 11:30:59 +01:00 |
|
ThomasV
|
24054ac399
|
Merge pull request #3943 from SomberNight/fee_cleanup
clean up fees a bit
|
2018-02-23 10:11:20 +01:00 |
|
ThomasV
|
d38a50b119
|
fix #3922: wrong parameter passed to connection_down
|
2018-02-23 09:35:07 +01:00 |
|
ThomasV
|
8329faf760
|
price_at_timestamp: minor fix
|
2018-02-23 09:11:25 +01:00 |
|
SomberNight
|
151aa9d135
|
fix prev; offset is relative to last forking height
|
2018-02-22 16:59:37 +01:00 |