ThomasV
275ba85595
Merge branch 'ser-master'
2018-01-19 16:01:49 +01:00
Serge Victor
98663d7e20
Intruduction of getfee command, fixes #3704
2018-01-19 16:01:22 +01:00
ThomasV
98daf2c7cc
network: send version first
2018-01-19 15:58:39 +01:00
ThomasV
35878b437a
network: send version first
2018-01-19 15:48:20 +01:00
ThomasV
e6dd3e6ad8
allow to save unbroadcasted transactions in wallet
2018-01-18 11:56:21 +01:00
SomberNight
a20a3f9714
fix: sweeping into same wallet
2018-01-17 01:46:00 +01:00
ThomasV
0dfaf9b970
Merge pull request #3736 from bauerj/issue-1795
...
Change number of zero when base unit changes
2018-01-16 22:32:30 +01:00
Johann Bauer
3dd4285fc5
Change number of zero when base unit changes
2018-01-16 21:52:45 +01:00
ThomasV
6f843a7bb6
Merge pull request #3734 from SomberNight/websocket_scripthash
...
websocket: migrate to scripthashes
2018-01-16 18:19:48 +01:00
SomberNight
fbad16b95c
revert adding handling of 'blockchain.address.subscribe' in network.py
2018-01-16 17:10:54 +01:00
SomberNight
d808bf057e
fix notify command and migrate to use scripthashes
2018-01-16 16:35:29 +01:00
SomberNight
5ec3d2888f
websocket: migrate to scripthashes
2018-01-16 16:02:58 +01:00
ThomasV
954897c281
Merge pull request #3732 from SomberNight/config_upgrade
...
Config upgrades
2018-01-16 13:50:04 +01:00
ThomasV
d6b77781a9
Merge pull request #3733 from SomberNight/remove_nossl
...
remove --nossl option
2018-01-16 13:49:02 +01:00
SomberNight
1c10d5dce1
remove --nossl option (follow-up dc388d4c7c
)
2018-01-16 12:36:39 +01:00
SomberNight
f77f029d72
config v2: change server protocol to :s instead of removing it
2018-01-16 11:53:31 +01:00
SomberNight
0d1ea09ed1
fix tests
2018-01-16 10:52:41 +01:00
SomberNight
04a1809969
config: implement config upgrades. remove system config.
2018-01-16 10:31:06 +01:00
ThomasV
58d889e480
Merge pull request #3726 from bauerj/android-docs
...
Update kivy docs to current build process
2018-01-15 18:44:39 +01:00
Johann Bauer
21e44bdb57
Update kivy docs to current build process
2018-01-15 18:38:30 +01:00
ThomasV
d580ecfb28
Merge pull request #3643 from SomberNight/fee_ui_feerounding
...
fee ui: rounding
2018-01-15 14:18:58 +01:00
racquemis
7d52cfd374
Handle invalid PIN on exporting private key
...
Prevent Android App from crashing when a wrong PIN is entered.
2018-01-14 12:40:23 +01:00
ThomasV
c9249281f3
Merge branch 'SomberNight-setconfig_rpcpassword'
2018-01-14 12:27:49 +01:00
SomberNight
a58d01ed54
setconfig rpcpassword: don't try to evaluate or reencode
2018-01-14 12:26:00 +01:00
ghost43
7b4b6b8f98
Merge pull request #3710 from nothingmuch/conditionally_share_opengl_contexts
...
QT: Only set "AA_ShareOpenGLContexts" if available
2018-01-13 21:38:31 +01:00
Yuval Kogman
34256c16f8
QT: Only set if hasattr(QtCore.Qt, "AA_ShareOpenGLContexts")
...
If the attribute does not exist (presumably in older versions of Qt),
this change prevents the following error:
AttributeError: type object 'Qt' has no attribute 'AA_ShareOpenGLContexts'
2018-01-13 20:17:02 +00:00
ThomasV
c8e67e2bd0
fix #3635
2018-01-13 17:09:25 +01:00
SomberNight
cc9032c9ea
fix #3680 (trezor: spending from multisig)
...
follow-up of #3621 (Make Electrum work with trezorlib 0.9.0)
2018-01-12 19:21:09 +01:00
SomberNight
f3f43c8f2a
Revert "disable p2wpkh for hw wallets for now"
...
This reverts commit e218c4a305
.
2018-01-12 18:46:08 +01:00
ThomasV
d731df3b22
Merge pull request #3699 from SomberNight/qt_shareopenglcontexts
...
QT: AA_ShareOpenGLContexts
2018-01-12 16:57:49 +01:00
SomberNight
0fbc0accb9
fix-up stdio gui
2018-01-12 15:05:27 +01:00
SomberNight
4435a6c9c7
use tx.txid() instead of tx.hash()
2018-01-12 14:18:50 +01:00
ThomasV
a94789b8ef
fix #3619 : set correct parent window
2018-01-12 12:13:19 +01:00
ThomasV
322d1bd1d0
Merge branch 'master' of github.com:spesmilo/electrum
2018-01-12 10:37:32 +01:00
ThomasV
4a40b3a0b2
separate merchant UI from main project
2018-01-12 10:37:14 +01:00
ThomasV
333b17fa60
Merge pull request #3703 from SomberNight/ledger_pin_lock_exc
...
ledger: handle pin-locked state better
2018-01-12 08:03:41 +01:00
SomberNight
2df0d7cec5
ledger: handle pin-locked state better
2018-01-12 04:03:43 +01:00
ghost43
faf8cec477
Merge pull request #3701 from marceloneil/fix-export-crash-electrum
...
Fix crash when exporting private keys
2018-01-12 01:16:21 +01:00
Marcel O'Neil
fe982cf826
fix crash when exporting private keys
2018-01-11 18:19:45 -05:00
SomberNight
4f5bc9cff0
QT: AA_ShareOpenGLContexts
...
Makes this go away:
"Qt WebEngine seems to be initialized from a plugin. Please set Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute before constructing QGuiApplication."
2018-01-11 17:49:15 +01:00
ThomasV
453cc263f7
Merge pull request #3682 from romanz/master
...
Mark electrum-env script as executable
2018-01-11 16:46:25 +01:00
ThomasV
d38303354c
Merge pull request #3683 from SomberNight/wizard_scriptnotsupported
...
wizard: allow to choose derivation again if script type is not supported
2018-01-11 16:45:55 +01:00
ThomasV
1da020c415
Merge pull request #3681 from SomberNight/trezor_native_segwit
...
trezor plugin: native segwit
2018-01-11 16:45:18 +01:00
ThomasV
359882d0b1
Merge pull request #3630 from SomberNight/bip84
...
bip84 for sw seeds
2018-01-11 16:43:34 +01:00
ghost43
3c755aaa90
Merge pull request #3679 from marceloneil/ledger-version-comparison
...
Better ledger version comparison
2018-01-10 21:51:48 +01:00
Marcel O'Neil
14cfd17096
better ledger version comparison
2018-01-10 14:15:21 -05:00
SomberNight
d8a9c9720a
follow-up 65eae139af
2018-01-10 18:39:25 +01:00
mzhou
65eae139af
add ability to show a receiving address on ledger screen ( #3538 )
...
add ability to show a receiving address on ledger screen
2018-01-10 18:37:41 +01:00
ThomasV
c5dae933ee
Merge pull request #3690 from SomberNight/multisig_privkey_export_warning
...
qt privkey export: if multisig wallet, warn users re backup
2018-01-10 16:56:00 +01:00
SomberNight
3ef778044e
qt privkey export: if multisig wallet, warn users re backup
2018-01-10 14:56:45 +01:00