SomberNight
38e3143bd0
fix command: createmultisig
2017-12-06 18:30:02 +01:00
SomberNight
0aee9bbbb0
fix spending from multisig (broken by 8be777e882
)
2017-12-06 16:02:40 +01:00
SomberNight
84239e168b
trezor/keepkey separation: init device
2017-12-04 19:56:46 +01:00
SomberNight
414b6e8a06
follow-up 958b794bc9
2017-12-04 19:04:05 +01:00
SomberNight
52eb4aebe6
follow-up 958b794bc9
2017-12-04 18:38:58 +01:00
SomberNight
1359fac4c9
trezor/keepkey separation: tx output type
2017-12-04 18:05:03 +01:00
SomberNight
65c15c5a03
fix verifymessage command
2017-12-04 17:36:57 +01:00
ThomasV
958b794bc9
separate trezor and keepkey codebase
2017-12-04 17:28:37 +01:00
ThomasV
a03a5c00e3
Merge pull request #3444 from SomberNight/2fa_tos_catch_exc
...
Catch exception when retrieving 2FA TOS
2017-12-04 12:45:45 +01:00
SomberNight
3bcfb8273a
Catch exception when retrieving 2FA TOS. Only allow user to continue if TOS was received.
2017-12-04 12:02:06 +01:00
SomberNight
80f99b68e0
fix: crash in QT InstallWizard if wallet path results in IOError and user still clicks Next (see #3404 )
2017-12-03 16:59:08 +01:00
ThomasV
e4c77d9156
Merge pull request #3435 from sunnyville01/selectable_statusbar_text
...
Selectable statusbar text
2017-12-03 11:33:21 +01:00
Sameer Zahid
a9a5647a9d
Make balance text in statusBar selectable
2017-12-03 02:18:37 +04:00
Sameer Zahid
8423234bbd
Merge branch 'master' of github.com:spesmilo/electrum
2017-12-03 02:15:51 +04:00
ThomasV
ff815acbd5
Merge pull request #3407 from SomberNight/fix_keepkey_p2sh_output
...
fix: keepkey sending to p2sh output
2017-12-02 16:57:57 +01:00
ThomasV
d878286a3a
Merge pull request #3431 from kyuupichan/upstream
...
Make trezor code specific to trezor
2017-12-02 13:00:58 +01:00
Neil Booth
bf452ecfe7
Make trezor code specific to trezor
...
Fixes #3308
2017-12-02 16:08:49 +09:00
Sameer Zahid
ce0617fb4b
Merge pull request #1 from spesmilo/master
...
Update
2017-12-01 15:47:05 +04:00
ThomasV
f0eb553681
Merge pull request #3380 from SomberNight/sweep_to_use_send_tab
...
use the send tab when sweeping (qt gui)
2017-11-30 13:42:33 +01:00
SomberNight
e65b598756
use the send tab when sweeping (qt gui)
2017-11-30 12:27:00 +01:00
ThomasV
683495b325
Merge pull request #3419 from cluelessperson/fix_rsakey
...
[easy] Typo breaks lib.rsakey.RSAKey.generate ?
2017-11-30 10:12:23 +01:00
cluelessperson
151e3ab8e0
minor
2017-11-29 18:14:39 -06:00
ThomasV
c34ea0066b
Merge pull request #3416 from bauerj/build-sh-tz
...
Make build timezone independent
2017-11-29 23:23:20 +01:00
Johann Bauer
307503fb97
Make build timezone independent
2017-11-29 23:19:12 +01:00
ThomasV
021272fb52
Merge pull request #3415 from bauerj/build-sh-tz
...
Make build location independent
2017-11-29 23:17:39 +01:00
Johann Bauer
201589b1a9
Make build timezone independent
2017-11-29 23:09:59 +01:00
ThomasV
599c138065
Merge branch 'master' of github.com:spesmilo/electrum
2017-11-29 19:04:32 +01:00
ThomasV
f715caa27d
fix #3413
2017-11-29 19:04:18 +01:00
ThomasV
7173101a06
Merge pull request #3412 from the9ull/virtualenv-python3
...
electrum-env creates python3 virtualenv
2017-11-29 14:30:57 +01:00
ThomasV
2ea59aad14
fix #3345 : do not require a wallet in order to sweep
2017-11-29 13:45:02 +01:00
ThomasV
61b69f3856
update get_history script
2017-11-29 10:14:39 +01:00
ThomasV
5158799689
fix windows build script: pushd and popd require bash
2017-11-29 06:52:12 +01:00
SomberNight
e700b0d731
fix: keepkey sending to p2sh output
2017-11-29 05:39:44 +01:00
ThomasV
8b66d7c8ae
windows builds: set timestamps before calling makensis
2017-11-28 18:52:36 +01:00
ThomasV
412ce18201
fix previous commit
2017-11-28 18:26:58 +01:00
ThomasV
b9d8b2a571
windows: build portable version without patching the source
2017-11-28 18:21:59 +01:00
ThomasV
3e72e7a3f0
Merge pull request #3397 from bauerj/build-sh
...
Add script for deterministic builds
2017-11-28 06:23:21 +01:00
Johann Bauer
5778102acc
Add script for deterministic builds
2017-11-28 00:32:38 +01:00
ThomasV
78400478fa
disable python bytecode during execution of pyinstaller
2017-11-27 20:53:36 +01:00
ThomasV
1eab1385e9
fix names (follow-up previous commit)
2017-11-27 19:56:39 +01:00
ThomasV
c8818cca05
rename file
2017-11-27 19:46:22 +01:00
ThomasV
67c561e4cd
windows builds: fetch locale files from github repo
2017-11-27 19:31:48 +01:00
ThomasV
d7fb5825f4
Merge pull request #3384 from bauerj/determinstic-packages
...
Save dependency versions in repo
2017-11-27 19:28:35 +01:00
Martino Salvetti
d0f179e347
Create python3 virtualenv
2017-11-27 11:42:49 +01:00
Johann Bauer
957178217c
Save dependency versions in repo
2017-11-26 23:22:07 +01:00
ThomasV
9425319dcd
Merge pull request #3367 from SomberNight/tx_size_est_uncompressed_pk
...
tx size estimation: handle uncompressed pubkeys
2017-11-24 10:26:08 +01:00
ThomasV
24af618164
Merge pull request #3370 from benma/devices
...
digitalbitbox: correctly handle user aborts
2017-11-24 10:24:47 +01:00
ThomasV
f4650a199a
Merge pull request #3366 from SomberNight/notify_inc_tx_icon_qt
...
follow-up #3361 (notifications for incoming transactions)
2017-11-24 10:24:00 +01:00
Marko Bencun
116026dee0
DeviceMgr: nicer message when pairing
...
The experience is a bit better if the user is prompted to connect,
instead of showing an error.
2017-11-24 10:12:53 +01:00
Marko Bencun
f3092a8b50
digitalbitbox: correctly handle user aborts
...
1. When the pairing is being forced and the user clicks 'No', the tx
was cancelled completely because the UserCancelled exception was
accidentally converted to an Exception.
2. Same with user aborting the signing process with a short touch on
the device (or a timeout).
2017-11-24 10:12:13 +01:00