Commit Graph

Select branches

Hide Pull Requests

add-joinmarket

master

Mono Color

• 599c138065 Merge branch 'master' of github.com:spesmilo/electrum ThomasV 2017-11-29 19:04:32 +0100
• f715caa27d fix #3413 ThomasV 2017-11-29 19:04:18 +0100
• 7173101a06
  Merge pull request #3412 from the9ull/virtualenv-python3 ThomasV 2017-11-29 14:30:57 +0100
• 2ea59aad14 fix #3345: do not require a wallet in order to sweep ThomasV 2017-11-29 13:45:02 +0100
• 61b69f3856 update get_history script ThomasV 2017-11-29 10:12:47 +0100
• 5158799689 fix windows build script: pushd and popd require bash ThomasV 2017-11-29 06:52:12 +0100
• e700b0d731 fix: keepkey sending to p2sh output SomberNight 2017-11-29 05:39:44 +0100
• 8b66d7c8ae windows builds: set timestamps before calling makensis ThomasV 2017-11-28 18:52:36 +0100
• 412ce18201 fix previous commit ThomasV 2017-11-28 18:26:58 +0100
• b9d8b2a571 windows: build portable version without patching the source ThomasV 2017-11-28 18:20:14 +0100
• 3e72e7a3f0
  Merge pull request #3397 from bauerj/build-sh ThomasV 2017-11-28 06:23:21 +0100
• 5778102acc Add script for deterministic builds Johann Bauer 2017-11-28 00:30:06 +0100
• 78400478fa disable python bytecode during execution of pyinstaller ThomasV 2017-11-27 20:53:36 +0100
• 1eab1385e9 fix names (follow-up previous commit) ThomasV 2017-11-27 19:56:39 +0100
• c8818cca05 rename file ThomasV 2017-11-27 19:46:22 +0100
• 67c561e4cd windows builds: fetch locale files from github repo ThomasV 2017-11-27 19:31:48 +0100
• d7fb5825f4
  Merge pull request #3384 from bauerj/determinstic-packages ThomasV 2017-11-27 19:28:35 +0100
• d0f179e347 Create python3 virtualenv Martino Salvetti 2017-11-27 11:42:49 +0100
• 957178217c Save dependency versions in repo Johann Bauer 2017-11-26 23:12:05 +0100
• 9425319dcd
  Merge pull request #3367 from SomberNight/tx_size_est_uncompressed_pk ThomasV 2017-11-24 10:26:08 +0100
• 24af618164
  Merge pull request #3370 from benma/devices ThomasV 2017-11-24 10:24:47 +0100
• f4650a199a
  Merge pull request #3366 from SomberNight/notify_inc_tx_icon_qt ThomasV 2017-11-24 10:24:00 +0100
• 116026dee0 DeviceMgr: nicer message when pairing Marko Bencun 2017-11-24 10:12:24 +0100
• f3092a8b50 digitalbitbox: correctly handle user aborts Marko Bencun 2017-11-24 10:09:59 +0100
• 8be777e882 tx size estimation: handle uncompressed pubkeys SomberNight 2017-11-24 04:23:59 +0100
• b950904ef4 follow-up #3361 (notifications for incoming transactions) SomberNight 2017-11-24 02:10:49 +0100
• 9fc946492b
  Merge pull request #3361 from bauerj/fix-notifications ThomasV 2017-11-23 19:33:24 +0100
• 355e77b39d
  Merge pull request #3362 from SomberNight/dbb_py3_hid_send ThomasV 2017-11-23 19:32:39 +0100
• b159164575 fix: py3 digitalbitbox hid_send SomberNight 2017-11-23 19:22:31 +0100
• 33d82aa121 Show notifications for incoming transactions Johann Bauer 2017-11-23 18:41:04 +0100
• 9edffd1754
  Merge pull request #3335 from SomberNight/cmd_getprivkeys ThomasV 2017-11-23 10:03:18 +0100
• ac5cbdaca2
  Merge pull request #3351 from SomberNight/segwit_tx_size_estimation ThomasV 2017-11-23 09:41:02 +0100
• 8a200aaf33
  Merge pull request #3354 from benma/dbb_segwit ThomasV 2017-11-23 09:27:16 +0100
• b31c51b3d0 digitalbitbox: add support for segwit Marko Bencun 2017-11-22 12:58:19 +0100
• b97402b796
  Merge pull request #3343 from fr3aker/fix-ipv6addr-parsing ThomasV 2017-11-22 12:41:50 +0100
• e3c14fed81
  Merge pull request #3352 from SomberNight/tests_testnet_addr ThomasV 2017-11-22 12:00:35 +0100
• 33bb5fee73 tests: testnet addresses SomberNight 2017-11-22 02:01:47 +0100
• e373f50596 follow-up prev commit SomberNight 2017-11-22 01:15:01 +0100
• a2a25e4738 better segwit tx size estimation SomberNight 2017-11-21 23:02:45 +0100
• b7d587c6ac
  fix parsing of ipv6 addresses in interface fr3aker 2017-11-20 20:17:58 +0100
• 66cce115ef more robust commands.getprivatekeys() and bitcoin.is_segwit_address() SomberNight 2017-11-19 23:46:59 +0100
• 0da1d4853b
  Merge pull request #3330 from SomberNight/dbb_clear_dialog ThomasV 2017-11-18 17:35:57 +0100
• 5cfe909194 digitalbitbox: delegate clear_dialog() calls to GUI thread SomberNight 2017-11-18 16:53:22 +0100
• 43181aea06
  Merge pull request #3326 from SomberNight/ledger_clear_dialog ThomasV 2017-11-18 11:39:46 +0100
• c9bef38dff fix: ledger clear_dialog() threading issues SomberNight 2017-11-18 04:09:15 +0100
• 219a5b02a6
  Merge pull request #3318 from SomberNight/qt_coins_disallow_label_edit ThomasV 2017-11-17 18:34:33 +0100
• 18df9e25b8
  Merge pull request #3322 from SomberNight/win_binaries_testnet_json ThomasV 2017-11-17 18:32:37 +0100
• 6e99c15c5c windows binaries were missing servers_testnet.json SomberNight 2017-11-17 18:14:17 +0100
• 1799b8a7af disallow editing labels in Coins tab (QT) SomberNight 2017-11-17 01:54:48 +0100
• c48efc5f3f
  Merge pull request #3310 from SomberNight/fix_greena_pw ThomasV 2017-11-15 13:24:57 +0100
• 204146b30a fix: GreenAddress verification with passworded wallet SomberNight 2017-11-15 12:12:11 +0100
• ff0cd16aec
  Merge pull request #3299 from SomberNight/bip39_checksum_after_entering_seed ThomasV 2017-11-14 10:25:07 +0100
• 5f30f95cdd fix: bip39 checksum not calculated if option was toggled after entering seed SomberNight 2017-11-14 01:44:55 +0100
• e9191caf39
  Merge pull request #3291 from SomberNight/ledger_old_fw_exception1 ThomasV 2017-11-13 18:11:14 +0100
• 098c2be919 follow-up 70d23f9e3b SomberNight 2017-11-13 16:18:56 +0100
• f97e81252d windows builds: download icons_rc.py from dedicated repo, because pyrcc5 is not deterministic ThomasV 2017-11-13 14:22:37 +0100
• 2d28532909 remove unused android icon ThomasV 2017-11-13 12:28:44 +0100
• 580f2da19d prepare 3.0.2 release ThomasV 2017-11-13 11:58:25 +0100
• 5e8791e5a4 trustedcoin: add message about how to request new code ThomasV 2017-11-13 11:47:25 +0100
• 60e0b43b81 fix 3262: protobuf SerializeToString() returns bytes.. ThomasV 2017-11-13 11:10:51 +0100
• e05854f004
  Merge pull request #3287 from JustinTArthur/clean-up-imports ThomasV 2017-11-13 09:58:59 +0100
• 857eb4ac1d Remove unused imports. Explicitly import a few deep imports. Justin Turner Arthur 2017-11-12 22:54:04 -0600
• 9a0aa9b478 Remove Python 2 support imports. Justin Turner Arthur 2017-11-12 16:39:04 -0600
• 8c84b349b8
  Merge pull request #3276 from SomberNight/file_io_with_open ThomasV 2017-11-13 09:23:21 +0100
• c90b666fd6
  Merge pull request #3288 from JustinTArthur/keepkey-cmdline-fix ThomasV 2017-11-13 09:21:40 +0100
• ab466a7660
  Merge pull request #3289 from JustinTArthur/simplify-bytes-funcs ThomasV 2017-11-13 09:21:20 +0100
• 0c04db33d8 Simplify bytes/hex conversion functions now that we're Python 3+ only. Justin Turner Arthur 2017-11-13 01:03:20 -0600
• 8cb34f4d88 Fix undefined reference error in command line KeepKey plugin. Justin Turner Arthur 2017-11-12 23:11:22 -0600
• 168326e184
  Merge pull request #3282 from JustinTArthur/fix-broken-commands ThomasV 2017-11-13 05:18:30 +0100
• 07629e12af Fixes to signing, notify commands and command exception handling. Justin Turner Arthur 2017-11-12 16:15:06 -0600
• c8a2ff15b8 install patched pyinstaller from my own repo ThomasV 2017-11-12 20:27:27 +0100
• c65d01ea96 file i/o: use 'with' keyword SomberNight 2017-11-12 14:33:46 +0100
• 8fcf1656d3 fix typo ThomasV 2017-11-11 18:12:51 +0100
• 3f18884dcd fix previous commit ThomasV 2017-11-11 18:11:14 +0100
• db8febea15 osx: parameters for Info.plist ThomasV 2017-11-11 17:59:47 +0100
• 91539189d5
  Merge pull request #3268 from SomberNight/sweep_minikey ThomasV 2017-11-11 11:41:41 +0100
• c4923ac99d
  Merge pull request #3182 from SomberNight/storage_upgrade_manual_for_qt ThomasV 2017-11-11 11:40:19 +0100
• 1cec6c8dec fix #3248: locktime ThomasV 2017-11-11 11:37:50 +0100
• 5156b60769 kivy addresses tab: simplify, separate actions from display updates ThomasV 2017-11-11 11:33:36 +0100
• 9e2cd17790 sweeping minikeys: search for both compressed and uncompressed pubkeys SomberNight 2017-11-11 11:02:30 +0100
• 39187c9a3a follow-up 115ef54c0c467ec79fba740ac49aa56bb5b2d756: wallet storage - silent upgrades whenever possible SomberNight 2017-11-11 09:23:56 +0100
• 568afd7a17
  Merge pull request #3265 from SomberNight/interface_tls_1_2 ThomasV 2017-11-11 00:45:25 +0100
• 7bdaf01656 fix trustedcoin plugin: google auth code ThomasV 2017-11-11 00:33:15 +0100
• 07e9415c2d interface ssl: besides TLS 1.1, also allow later versions SomberNight 2017-11-10 21:39:20 +0100
• c46f219d25 kivy: fix crash in show_private_key ThomasV 2017-11-10 11:12:29 +0100
• 786f9ce7ff
  Merge pull request #3206 from ariard/kivy-addr ThomasV 2017-11-10 10:56:32 +0100
• 0ecb665b95
  Merge pull request #3257 from SomberNight/bitcoin_network_constants ThomasV 2017-11-10 09:15:40 +0100
• 23c0269252
  Merge pull request #3258 from SomberNight/wallet_check_password_dedup ThomasV 2017-11-09 22:21:01 +0100
• d0cb19a0b2
  Merge pull request #3259 from SomberNight/remove_requires_fee ThomasV 2017-11-09 22:19:56 +0100
• f8518c78d8 remove Transaction.requires_fee() SomberNight 2017-11-09 22:15:47 +0100
• bdfd3e7190 wallet.check_password() remove code duplication SomberNight 2017-11-09 19:15:36 +0100
• ce4be1f8f2
  Merge pull request #3256 from ariard/fix_clearrequests ThomasV 2017-11-09 18:06:50 +0100
• 213798cfce [fix clearrequests] error iteration dictionary changed size Antoine Riard 2017-11-09 11:54:25 -0500
• 0db5ea67a0 bitcoin.NetworkConstants: easier changing between testnet and mainnet SomberNight 2017-11-09 17:47:57 +0100
• ccc9415542 windows: force upgrade of hawdrware wallet libraries ThomasV 2017-11-09 10:58:42 +0100
• b4bea48b22
  Merge pull request #3249 from bauerj/coverage ThomasV 2017-11-08 22:42:48 +0100
• 81fa9d8b0f Fix wrong branch name Johann Bauer 2017-11-08 22:31:13 +0100
• 20edb93549
  Merge pull request #3247 from SomberNight/py3_do_export_history ThomasV 2017-11-08 20:41:16 +0100
• 3d002939f9 fix py3: do_export_history SomberNight 2017-11-08 20:31:53 +0100
• 8d76ca9359
  Merge pull request #3245 from bauerj/coverage ThomasV 2017-11-08 20:26:32 +0100