Commit Graph

8391 Commits

Author SHA1 Message Date
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
SomberNight 9416e5bc35 wizard: allow to choose derivation again if script type is not supported (instead of closing the wizard) 2018-01-09 21:10:32 +01:00
Roman Zeyde 8342f1a26f chmod +x electrum-env 2018-01-09 20:19:30 +02:00
SomberNight 1387a45908 trezor plugin: native segwit and bip84 2018-01-09 17:09:58 +01:00
SomberNight 7cf547c4b8 follow-up #3621 (trezor plugin changes for trezorlib 0.9.0) 2018-01-09 16:39:39 +01:00
ghost43 ffcb926a15
Merge pull request #3677 from pooler/gettarget-fix
Fix Blockchain.get_target()
2018-01-08 22:56:07 +01:00
SomberNight 41660d26e9 follow-up 553bf98664
fixes AttributeError: 'QTextEdit' object has no attribute 'text'
2018-01-08 22:36:13 +01:00
pooler 8bcefe6cfa Fix Blockchain.get_target() 2018-01-08 21:48:09 +01:00
ThomasV 553bf98664 disable qr scanning of seeds, because the android app does not use it anymore 2018-01-08 10:25:27 +01:00
ThomasV ce22d2b4ca
Merge pull request #3665 from joren485/travis_cache
Cache pip installs in travis
2018-01-08 09:47:37 +01:00
ThomasV 57e0ca5a47
Merge pull request #3666 from marceloneil/fix-locale-docs
Fix locale documentation
2018-01-08 09:44:38 +01:00
SomberNight 9d46703c6f fix #3663: 'copying' QR code does not save to file 2018-01-08 02:28:13 +01:00
ThomasV eaeac4ca51 version 3.0.5 2018-01-08 01:22:12 +01:00
ThomasV b076f45f8e
Merge pull request #3664 from SomberNight/json_rpc_pw
Password-protect the JSON RPC interface
2018-01-08 00:28:27 +01:00
ThomasV 1020449684 disable jsonrpc commands in the GUI 2018-01-08 00:20:46 +01:00
ThomasV 7c702b518d disable jsonrpc on android 2018-01-08 00:20:27 +01:00
Joren Vrancken 77a9861353 Cache pip installs in travis 2018-01-07 22:55:00 +01:00
Marcel O'Neil 50ef0063c4
fix locale documentation 2018-01-07 16:48:02 -05:00
SomberNight af527b21fb Password-protect the JSON RPC interface 2018-01-07 19:30:23 +01:00
ThomasV f8fad2fd29 release 3.0.4 2018-01-07 02:49:39 +01:00
ThomasV 6be7bda023
Merge pull request #3659 from mithrandi/patch-1
Stop allowing CORS for the JSON-RPC server
2018-01-06 20:51:55 +01:00
ThomasV 1fe18ab1ce
Merge pull request #3611 from SomberNight/mnemonic_enforce_num_words
avoid shorter seeds 'by luck'
2018-01-06 12:51:30 +01:00
ThomasV c4e4d8a1dd
Merge pull request #3650 from SomberNight/daemon_lockfile_not_exec
make daemon lockfile not executable
2018-01-06 12:38:05 +01:00
Tristan Seligmann 0cf67997c0
Stop allowing CORS for the JSON-RPC server
As far as I can tell, there is no need to allow this, and doing so poses severe security risks (see #3374).
2018-01-06 08:42:54 +02:00
SomberNight aeee5e907c enable some translations in base_wizard.py 2018-01-05 13:42:06 +01:00
SomberNight f9e9597381 make daemon lockfile not executable 2018-01-04 23:41:10 +01:00
SomberNight 6d88eab005 tests: added 2fa seed case to test_wallet_vertical.py 2018-01-04 22:21:05 +01:00
SomberNight 99a08f35b2 Clean up messages about msg signing/verification.
Allow translations. Test is_mine before txin_type. Show txin_type in msg.
2018-01-04 21:30:06 +01:00
SomberNight 563aae0dbd fix #3411 2018-01-04 03:40:35 +01:00
ThomasV 012a636fab
Merge pull request #3633 from wolfmankurd/master
Show message hash when signing
2018-01-02 09:47:36 +01:00
ThomasV 1cc7e61433
Merge pull request #3634 from achow101/avoid-list-mod
Avoid modifying self.transactions in prepare_for_verifier
2018-01-02 09:47:05 +01:00
Andrew Chow 0a83b3af22 Avoid modifying self.transactions in prepare_for_verifier
In python3, the `.keys()` function returns an iterator, not a list,
so to get a list that can be iterated over, use `list()` instead to
avoid modification of a list while in use.
2018-01-01 18:03:00 -05:00
Ali Raheem ed86fee3fe
Format of message hash to match Ledger
On signing SHA256 of message is shown on Ledger in caps. Make Electrum show in same format to save confusion.
2018-01-01 21:23:37 +00:00
Ali Raheem 19ba2364b6
Show message sign when signing
Allow verification by showing the SHA256 hash of the message to be signed (which is also displayed on Ledger).
2018-01-01 20:55:10 +00:00
ThomasV 7ae1a4cdeb
Merge pull request #3593 from SomberNight/scan_qr_textedit_allow_multi
ScanQRTextEdit optionally allows to concat data
2017-12-31 18:04:21 +01:00