Commit graph

7983 commits

Author SHA1 Message Date
ThomasV
66e1231580 check seed_version is not too high 2017-10-27 16:27:57 +02:00
ThomasV
648d5c0cbb fix requires_upgrade 2017-10-27 15:03:22 +02:00
ThomasV
62fe3a411b Merge pull request #3133 from SomberNight/payment_req1
fix: payment request related stuff
2017-10-27 11:20:39 +02:00
ThomasV
93d7aebae4 Merge pull request #3135 from SomberNight/payment_req2
Payment request: "pay now" allow multiple attempts
2017-10-27 11:20:04 +02:00
SomberNight
7c3a0905ce fix #3134 2017-10-27 03:06:41 +02:00
SomberNight
0d0f8c5842 fix: payment request related stuff (qt crash, exporting, refresh bug) 2017-10-27 02:32:49 +02:00
ThomasV
e7d4bf2945 fix typo 2017-10-26 22:16:14 +02:00
ThomasV
52a482a9b5 display segwit warning in privkey window 2017-10-26 18:40:31 +02:00
ThomasV
337675d134 add safety notice 2017-10-26 18:21:24 +02:00
ThomasV
a00203d374 Merge pull request #3128 from SomberNight/netw_dial_refresh_proxy_settings
(QT network dialog) don't keep resetting proxy settings
2017-10-26 16:16:50 +02:00
SomberNight
bf024db7aa follow-up prev comit 2017-10-26 16:14:09 +02:00
SomberNight
404584bfe6 fix: (QT network dialog) don't keep resetting proxy settings 2017-10-26 15:21:44 +02:00
ThomasV
f6cc37d1d2 Merge branch 'master' of github.com:spesmilo/electrum 2017-10-26 11:23:41 +02:00
ThomasV
ffc0cc3c1f Merge pull request #3123 from SomberNight/fix_parse_witness_coinbase
fix: transaction.parse_witness() for coinbase
2017-10-26 11:23:28 +02:00
ThomasV
a5e2b18af2 Merge pull request #3122 from SomberNight/test_transaction_txid
tests: transaction.txid()
2017-10-26 11:22:59 +02:00
SomberNight
32e88495ae fix: transaction.parse_witness() for coinbase 2017-10-26 00:40:08 +02:00
SomberNight
fb47dbb75a tests: transaction.txid() 2017-10-26 00:35:18 +02:00
ThomasV
89240571d4 py3: socket.error is deprecated 2017-10-25 18:22:54 +02:00
ThomasV
1cbc794229 interface: catch py3 exceptions 2017-10-25 17:43:30 +02:00
ThomasV
06f18f9078 chmod +x make_osx 2017-10-25 09:13:00 +02:00
ThomasV
a91de6a236 Merge pull request #3114 from SomberNight/typo_wallet_import_priv_key
typo in wallet.import_private_key()
2017-10-25 07:29:20 +02:00
SomberNight
1f102913e9 typo in wallet.import_private_key() 2017-10-25 06:54:51 +02:00
ThomasV
f7200cb616 use pyinstaller for OSX builds 2017-10-24 22:52:53 +02:00
ThomasV
5665b42999 remove six 2017-10-24 14:04:16 +02:00
ThomasV
93b6abe701 make_osx: py3 2017-10-24 13:08:16 +02:00
ThomasV
55e6c247bc Merge pull request #3102 from SomberNight/2fa_plugin_cant_be_disabled
Disallow disabling TrustedCoin for 2FA wallets
2017-10-24 07:11:20 +02:00
SomberNight
523de69b5e Introduced BasePlugin.can_user_disable(). TrustedCoin plugin can't be disabled by user. 2017-10-24 04:42:52 +02:00
ThomasV
020f0637d7 trezor: only TYPE_ADDRESS is needed for non-change outputs 2017-10-23 14:03:43 +02:00
ThomasV
7578ce2331 cleanup py2 compatibility imports 2017-10-23 13:54:09 +02:00
ThomasV
6e0e5a8d57 wizard: allow segwit seed as cosigner 2017-10-23 06:42:34 +02:00
ThomasV
306aab8237 Merge pull request #3096 from SomberNight/2fa_wallet_missing_wallet_type_attr
fix: set wallet_type attr for 2fa wallets
2017-10-23 06:19:07 +02:00
SomberNight
b0bab75859 fix: set wallet_type attr for 2fa wallets 2017-10-23 03:08:06 +02:00
ThomasV
af8b7a7fb1 Merge pull request #3092 from SomberNight/fix_restore_2fa_as_standard
Return loaded plugin from plugins.load_plugin()
2017-10-22 23:52:50 +02:00
SomberNight
2457ac8774 fix #3091 2017-10-22 23:47:11 +02:00
ThomasV
fe82a7905c Merge pull request #3090 from bauerj/dark2
Follow-up #2983
2017-10-22 21:05:34 +02:00
Johann Bauer
027821d7aa Follow-up #2983 2017-10-22 20:05:52 +02:00
ThomasV
4c88159efb move delete button to menu 2017-10-22 17:30:24 +02:00
ThomasV
4297270aae fix #2593: add delete button 2017-10-22 17:00:59 +02:00
ThomasV
fae4c8cd00 wallet information dialog 2017-10-22 16:17:57 +02:00
ThomasV
6921e9fece kivy: do not display 'signing' message if user cancels send_tx 2017-10-22 15:50:32 +02:00
ThomasV
7cf075c754 follow up b8c7edf070 2017-10-22 15:14:09 +02:00
ThomasV
02cd5497eb Merge pull request #3087 from SomberNight/fix_contacts_import
fix: contacts import
2017-10-22 14:43:08 +02:00
ThomasV
9615279c3d Merge pull request #3088 from bauerj/nsis-silent
Install NSIS silently
2017-10-22 14:42:35 +02:00
Johann Bauer
c53078c7c1 Install NSIS silently 2017-10-22 13:53:49 +02:00
SomberNight
29c34332ac fix: contacts import 2017-10-22 13:46:05 +02:00
ThomasV
290999b9a8 kivy: py3 update for scanning transaction 2017-10-22 12:50:28 +02:00
ThomasV
8683d71711 fix: witness serialization 2017-10-22 12:39:36 +02:00
ThomasV
b8c7edf070 return bytes in scan_barcode 2017-10-22 12:04:00 +02:00
ThomasV
5cc71ef84b Merge pull request #3085 from SomberNight/aes_padding_pkcs7
bitcoin.py AES: implement our own PKCS7 padding
2017-10-22 08:34:29 +02:00
ThomasV
42f9d1ee63 kivy: py3 updates 2017-10-22 07:33:03 +02:00