Commit Graph

8175 Commits

Author SHA1 Message Date
ThomasV 2d28532909 remove unused android icon 2017-11-13 12:28:44 +01:00
ThomasV 580f2da19d prepare 3.0.2 release 2017-11-13 11:58:25 +01:00
ThomasV 5e8791e5a4 trustedcoin: add message about how to request new code 2017-11-13 11:47:25 +01:00
ThomasV 60e0b43b81 fix 3262: protobuf SerializeToString() returns bytes.. 2017-11-13 11:10:51 +01:00
ThomasV e05854f004
Merge pull request #3287 from JustinTArthur/clean-up-imports
Clean up imports
2017-11-13 09:58:59 +01:00
Justin Turner Arthur 857eb4ac1d Remove unused imports. Explicitly import a few deep imports. 2017-11-13 02:28:00 -06:00
Justin Turner Arthur 9a0aa9b478 Remove Python 2 support imports. 2017-11-13 02:26:48 -06:00
ThomasV 8c84b349b8
Merge pull request #3276 from SomberNight/file_io_with_open
file i/o: use 'with' keyword
2017-11-13 09:23:21 +01:00
ThomasV c90b666fd6
Merge pull request #3288 from JustinTArthur/keepkey-cmdline-fix
Fix undefined reference error in command line KeepKey plugin.
2017-11-13 09:21:40 +01:00
ThomasV ab466a7660
Merge pull request #3289 from JustinTArthur/simplify-bytes-funcs
Simplify bytes/hex conversion functions now that we're Python 3+ only.
2017-11-13 09:21:20 +01:00
Justin Turner Arthur 0c04db33d8 Simplify bytes/hex conversion functions now that we're Python 3+ only. 2017-11-13 01:03:20 -06:00
Justin Turner Arthur 8cb34f4d88 Fix undefined reference error in command line KeepKey plugin. 2017-11-12 23:11:22 -06:00
ThomasV 168326e184
Merge pull request #3282 from JustinTArthur/fix-broken-commands
Fixes to signing, notify commands and command exception handling.
2017-11-13 05:18:30 +01:00
Justin Turner Arthur 07629e12af Fixes to signing, notify commands and command exception handling. 2017-11-12 16:15:06 -06:00
ThomasV c8a2ff15b8 install patched pyinstaller from my own repo 2017-11-12 20:29:19 +01:00
SomberNight c65d01ea96 file i/o: use 'with' keyword 2017-11-12 14:33:46 +01:00
ThomasV 8fcf1656d3 fix typo 2017-11-11 18:12:51 +01:00
ThomasV 3f18884dcd fix previous commit 2017-11-11 18:11:14 +01:00
ThomasV db8febea15 osx: parameters for Info.plist 2017-11-11 17:59:47 +01:00
ThomasV 91539189d5
Merge pull request #3268 from SomberNight/sweep_minikey
sweeping minikeys: search for both compressed and uncompressed pubkeys
2017-11-11 11:41:41 +01:00
ThomasV c4923ac99d
Merge pull request #3182 from SomberNight/storage_upgrade_manual_for_qt
wallet storage upgrade will now happen silently whenever possible
2017-11-11 11:40:19 +01:00
ThomasV 1cec6c8dec fix #3248: locktime 2017-11-11 11:37:50 +01:00
ThomasV 5156b60769 kivy addresses tab: simplify, separate actions from display updates 2017-11-11 11:33:36 +01:00
SomberNight 9e2cd17790 sweeping minikeys: search for both compressed and uncompressed pubkeys 2017-11-11 11:02:30 +01:00
SomberNight 39187c9a3a follow-up 115ef54c0c467ec79fba740ac49aa56bb5b2d756: wallet storage - silent upgrades whenever possible 2017-11-11 09:23:56 +01:00
ThomasV 568afd7a17
Merge pull request #3265 from SomberNight/interface_tls_1_2
interface ssl: besides TLS 1.1, also allow later versions
2017-11-11 00:45:25 +01:00
ThomasV 7bdaf01656 fix trustedcoin plugin: google auth code 2017-11-11 00:33:15 +01:00
SomberNight 07e9415c2d interface ssl: besides TLS 1.1, also allow later versions 2017-11-10 21:39:20 +01:00
ThomasV c46f219d25 kivy: fix crash in show_private_key 2017-11-10 11:12:29 +01:00
ThomasV 786f9ce7ff
Merge pull request #3206 from ariard/kivy-addr
kivy: replace requests tab by address tab
2017-11-10 10:56:32 +01:00
ThomasV 0ecb665b95
Merge pull request #3257 from SomberNight/bitcoin_network_constants
bitcoin.NetworkConstants: easier changing between testnet and mainnet
2017-11-10 09:15:40 +01:00
ThomasV 23c0269252
Merge pull request #3258 from SomberNight/wallet_check_password_dedup
wallet.check_password() remove code duplication
2017-11-09 22:21:01 +01:00
ThomasV d0cb19a0b2
Merge pull request #3259 from SomberNight/remove_requires_fee
remove Transaction.requires_fee()
2017-11-09 22:19:56 +01:00
SomberNight f8518c78d8 remove Transaction.requires_fee() 2017-11-09 22:15:47 +01:00
SomberNight bdfd3e7190 wallet.check_password() remove code duplication 2017-11-09 19:15:36 +01:00
ThomasV ce4be1f8f2
Merge pull request #3256 from ariard/fix_clearrequests
[fix clearrequests] dictionary changed size during iteration
2017-11-09 18:06:50 +01:00
Antoine Riard 213798cfce [fix clearrequests] error iteration dictionary changed size 2017-11-09 11:54:25 -05:00
SomberNight 0db5ea67a0 bitcoin.NetworkConstants: easier changing between testnet and mainnet 2017-11-09 17:47:57 +01:00
ThomasV ccc9415542 windows: force upgrade of hawdrware wallet libraries 2017-11-09 10:58:42 +01:00
ThomasV b4bea48b22
Merge pull request #3249 from bauerj/coverage
Follow-up #3245: Fix wrong branch name in badge
2017-11-08 22:42:48 +01:00
Johann Bauer 81fa9d8b0f Fix wrong branch name 2017-11-08 22:31:13 +01:00
ThomasV 20edb93549
Merge pull request #3247 from SomberNight/py3_do_export_history
fix py3: do_export_history
2017-11-08 20:41:16 +01:00
SomberNight 3d002939f9 fix py3: do_export_history 2017-11-08 20:31:53 +01:00
ThomasV 8d76ca9359
Merge pull request #3245 from bauerj/coverage
Upload coverage statistics from Travis
2017-11-08 20:26:32 +01:00
Johann Bauer ceed56c217 Upload coverage statistics from Travis 2017-11-08 18:18:20 +01:00
ThomasV 6acc4214c9 Merge branch 'master' of github.com:spesmilo/electrum 2017-11-08 15:01:45 +01:00
ThomasV ea4d2343d3 revert 1ecfcea8dc after btchip-python has been fixed 2017-11-08 15:01:25 +01:00
ThomasV 31d85c22d9
Merge pull request #3231 from SomberNight/win_setup_exe_properly
win binaries: build a proper setup.exe that uses local folder
2017-11-08 14:56:06 +01:00
ThomasV bf2c07ff2a fix #3244 2017-11-08 14:48:46 +01:00
ThomasV 368aaebb23
Merge pull request #3235 from SomberNight/fix_delete_passworded_wallets
fix: deleting a passworded wallet did not work
2017-11-07 17:42:28 +01:00