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 |
|
Johann Bauer
|
2bde686752
|
Windows Build: Create tmp dir
|
2018-03-05 17:16:30 +01:00 |
ThomasV
|
360dd5a7aa
|
Merge pull request #4028 from SomberNight/wizard_menu_master_key_str
wizard: rename option to "use a master key"
|
2018-03-05 13:03:26 +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
|
e971bd8498
|
update release notes, add date
|
2018-03-05 10:39:29 +01:00 |
|
ThomasV
|
fe67012f71
|
Merge pull request #4025 from SomberNight/release_notes_3_1
release notes: 3.1 - more stuff
|
2018-03-05 10:15:07 +01:00 |
|
ThomasV
|
89599cf0d5
|
simplify fee preferences dialog
|
2018-03-05 10:12:44 +01:00 |
|
ThomasV
|
0bca97dd2f
|
improve fee status message
|
2018-03-05 09:49:17 +01:00 |
|
SomberNight
|
fd4142703c
|
typo in prev
|
2018-03-05 09:43:45 +01:00 |
|
SomberNight
|
e537b58d10
|
release notes: 3.1 - more stuff
|
2018-03-05 09:39:55 +01:00 |
|
ThomasV
|
2b5117ab3d
|
kivy: fix tx dialog message
|
2018-03-05 09:37:25 +01:00 |
|
SomberNight
|
219ea6588b
|
update default server list
|
2018-03-05 06:00:24 +01:00 |
|
ThomasV
|
c9b0840c78
|
kivy: minor fixes related to exchange rates
|
2018-03-04 23:58:38 +01:00 |
|
ThomasV
|
c3ff6040d2
|
Merge pull request #4008 from SomberNight/network_constants_refactor
refactor network constants
|
2018-03-04 23:13:50 +01:00 |
|
SomberNight
|
81b6d65764
|
refactor network constants
|
2018-03-04 22:10:59 +01:00 |
|
ThomasV
|
1c0e23c8b9
|
Revert "Add JPY exchange rate"
This reverts commit c2da8eb46d.
|
2018-03-04 10:35:14 +01:00 |
|
ThomasV
|
56c94153ff
|
kivy: simplify fee dialog
|
2018-03-04 10:29:56 +01:00 |
|
ThomasV
|
451ac0d259
|
Merge pull request #4007 from wakiyamap/add_jpy_exchange_rate
Add JPY exchange rate
|
2018-03-04 09:31:45 +01:00 |
|
WakiyamaP
|
c2da8eb46d
|
Add JPY exchange rate
|
2018-03-04 04:48:08 +09:00 |
|
Johann Bauer
|
10057b18de
|
Cache dependencies for Travis build
Also: * Move temporary directory to /tmp
* Remove files with wrong hash (so we don't have to remove them manually)
|
2018-03-03 19:58:31 +01:00 |
|
Johann Bauer
|
83f2dc44de
|
Add websocket library to binary for Ledger 2FA support
Closes: #2433
|
2018-03-03 19:37:32 +01:00 |
|
ThomasV
|
2e594d2d7a
|
kivy: simplify fee dialog
|
2018-03-03 14:58:55 +01:00 |
|
ThomasV
|
721dc8cdb9
|
kivy: larger history icons
|
2018-03-03 12:18:01 +01:00 |
|
ThomasV
|
1526768cd6
|
kivy: simplify history screen, display either fiat or btc
|
2018-03-03 11:32:38 +01:00 |
|
ThomasV
|
f863e7c7a8
|
follow-up previous commit
|
2018-03-03 10:36:56 +01:00 |
|
ThomasV
|
1e6d522137
|
kivy: more usable amount dialog
|
2018-03-03 10:08:51 +01:00 |
|
ThomasV
|
7e501115cd
|
Merge pull request #4005 from SomberNight/trezor_segwit_offline_signing
trezor: segwit offline signing
|
2018-03-03 09:59:04 +01:00 |
Jon Layton
|
8f07eaf19d
|
Merge pull request #158 from BTCP-community/Z_1.0.5
Increment version to 1.0.5
|
2018-03-03 00:01:14 -06: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
|
f93c3d79d7
|
fix #3740
|
2018-03-02 19:33:33 +01:00 |
|
ThomasV
|
3a38c251ac
|
Merge branch 'master' of github.com:spesmilo/electrum
|
2018-03-02 19:16:20 +01:00 |
|
ThomasV
|
d5effe48d0
|
kivy: do not show balance in every tab. fixes #3350
|
2018-03-02 19:16:08 +01:00 |
|
SomberNight
|
ef9d1110d0
|
qt address list: remove dead code
This role was in collision with SortableTreeWidgetItem.DataRole; and was otherwise not used anywhere.
|
2018-03-02 19:13:59 +01:00 |
|
ThomasV
|
4b7cf297f5
|
fix #3998
|
2018-03-02 18:00:05 +01:00 |
|
ThomasV
|
2a51914c31
|
improve message
|
2018-03-02 17:33:41 +01:00 |
|
Johann Bauer
|
3965176295
|
Enable sorting of list widgets
|
2018-03-02 12:24:18 +01:00 |
|
ThomasV
|
b2c7d2d2cc
|
kivy: do not cache fee dialog
|
2018-03-02 10:31:00 +01:00 |
|
ThomasV
|
73af7ac824
|
Merge branch 'master' of github.com:spesmilo/electrum
|
2018-03-02 09:46:22 +01:00 |
|
ThomasV
|
4321950f63
|
kivy: update fee dialog on new fee
|
2018-03-02 09:46:10 +01:00 |
|
SomberNight
|
02f2e5c599
|
wallet.add_transaction: adding to spent_outpoints, out of order case
|
2018-03-02 07:56:17 +01:00 |
|
ThomasV
|
a6e43ddd51
|
Merge pull request #3997 from SomberNight/trezort_passphrases
trezorT: fix/implement passphrases
|
2018-03-02 06:56:47 +01:00 |
|
ThomasV
|
2eb98c339a
|
Merge pull request #3984 from Lastrellik/master
Create file caching system
|
2018-03-02 06:54:39 +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 |