Commit Graph

7791 Commits

Author SHA1 Message Date
ThomasV 91ed74a95f Merge branch 'master' of github.com:spesmilo/electrum 2017-10-03 14:16:55 +02:00
ThomasV 4273c607b7 fix #2961 2017-10-03 14:16:43 +02:00
ThomasV 6c3b8af8d6 Merge pull request #2963 from SomberNight/unresolved_var_tx_parse_redeemScript
fix: unresolved variable _bytes in transaction.parse_redeemScript()
2017-10-03 14:07:44 +02:00
ThomasV 1ebc872755 Merge pull request #2966 from SomberNight/py3_text_ui
fixes in text UI (mainly py3)
2017-10-03 14:03:10 +02:00
ThomasV 6e5c2980ec Merge pull request #2965 from SomberNight/py3_dict_keys1
fix: py3 network_dialog - dict.keys()
2017-10-03 14:01:39 +02:00
SomberNight db1d632ddb fix: [text UI] Send tab: up and down movement 2017-10-03 08:11:17 +02:00
SomberNight cf6d6608eb fix: [text UI] changing proxy 2017-10-03 07:59:21 +02:00
SomberNight 6353f1a8f0 fix: py3 network_dialog - dict.keys() returns dict_keys(list) instead of list 2017-10-03 07:14:21 +02:00
SomberNight 555fe4373e py3 fixes in text UI 2017-10-03 07:09:55 +02:00
SomberNight 902ec2dc69 fix: unresolved variable _bytes in transaction.parse_redeemScript() 2017-10-03 01:34:45 +02:00
ThomasV 031b911dce fix cache with h2addr 2017-09-30 13:01:33 +02:00
ThomasV 34628533fb fix typo 2017-09-30 13:00:52 +02:00
ThomasV 1c1cb3c71d Merge pull request #2954 from SomberNight/py3_env
py3: electrum-env
2017-09-30 08:55:58 +02:00
ThomasV bc4b263cab Merge pull request #2953 from SomberNight/contacts_edit_crash
fix: contact name editing
2017-09-30 08:54:24 +02:00
SomberNight 89b7f5332f py3: electrum-env 2017-09-30 07:04:11 +02:00
SomberNight f091bd8694 fix: contact name editing 2017-09-29 22:55:14 +02:00
ThomasV 1daecf285d Merge pull request #2950 from SomberNight/tests_wallet_keystore
tests: wallet-keystore integrity (seed->address)
2017-09-29 20:12:42 +02:00
ThomasV c73819a3d4 fix tests 2017-09-29 17:49:29 +02:00
ThomasV fed76bfffc Merge branch 'master' of github.com:spesmilo/electrum 2017-09-29 15:36:01 +02:00
ThomasV e8b564c0e7 Extend Wallet Import Format with txin type. Extend class Imported_Wallet. 2017-09-29 15:32:55 +02:00
SomberNight f3bbb52b91 tests: wallet-keystore integrity (seed->address) 2017-09-29 05:03:22 +02:00
ThomasV 088b1e6f79 Merge pull request #2942 from lzsaver/py3-macos
Update README.rst for Python 3 on macOS
2017-09-27 07:52:23 +02:00
ThomasV da0f51df37 Merge pull request #2943 from SomberNight/msg_signing_tests
tests: message signing
2017-09-27 07:51:34 +02:00
ThomasV 4864c802dd fix message signing #2939 2017-09-27 07:47:41 +02:00
ThomasV d940956cfe Merge pull request #2940 from SomberNight/2fa_reset_json
fix json error when resetting 2fa
2017-09-27 07:24:31 +02:00
SomberNight 7542bc9e35 tests: message signing 2017-09-27 03:57:49 +02:00
Alexx Saver 4df8793062 Update README.rst for Python 3 on macOS 2017-09-27 04:40:22 +04:00
SomberNight e05c8439e6 fix json error when resetting 2fa 2017-09-27 01:51:21 +02:00
ThomasV dcd50c3467 fix #2927 2017-09-26 08:49:28 +02:00
ThomasV 641b9c67cf Merge pull request #2930 from SomberNight/win_build_plugins
include plugins in windows builds
2017-09-26 06:43:17 +02:00
SomberNight 47627999b5 include plugins in windows builds 2017-09-26 03:19:54 +02:00
ThomasV e91aa882ba fix console: python3 exec 2017-09-25 23:33:11 +02:00
ThomasV 6e936db94a Merge pull request #2918 from SomberNight/qt_plugins_grid
fix qt plugins crash
2017-09-25 21:26:04 +02:00
ThomasV 6dfd3a0cab Merge pull request #2926 from benma/dbb_py3_2
digitalbitbox: fixed some more python3 issues
2017-09-25 06:28:42 +02:00
Marko Bencun bece1329cc digitalbitbox: fixed some more python3 issues 2017-09-25 00:06:24 +02:00
ThomasV 952049f74b fix #2915 2017-09-24 13:35:53 +02:00
ThomasV e014e3af75 qt wizard: fix scroll area 2017-09-24 11:52:53 +02:00
ThomasV 2239cb9624 fix #2921 2017-09-24 10:18:08 +02:00
ThomasV 4c22698444 fix qt5: setBackgroundColor 2017-09-24 10:04:32 +02:00
ThomasV 417cd2581a Merge pull request #2916 from bauerj/windows-35
Update Windows build to Python 3.5 and PyQt5
2017-09-24 09:43:35 +02:00
ThomasV 99bc43d8db Merge pull request #2911 from SomberNight/pyqt5
migration to PyQt5
2017-09-24 09:42:32 +02:00
ThomasV c43b48f4f5 Merge pull request #2917 from SomberNight/get_server
log: identify exception source in log for daemon/get_server
2017-09-24 09:40:33 +02:00
ThomasV 2e06a9d020 Merge pull request #2925 from wakiyamap/include_locale_for_windows_binary
include locale for windows binary
2017-09-24 09:37:49 +02:00
ThomasV 70983bb177 Merge pull request #2919 from SomberNight/currency_btce
finish BTCe to WEX renaming
2017-09-24 09:32:35 +02:00
ThomasV e0a323e0be Merge pull request #2922 from SomberNight/grammar_trustedcoin
grammar fix (trustedcoin)
2017-09-24 09:27:45 +02:00
ThomasV f6178c7314 Merge pull request #2924 from SomberNight/py3_exchange_rate
python3: exchange_rate.py
2017-09-24 09:27:25 +02:00
WakiyamaP 94fc9776f1 include locale for windows binary 2017-09-24 15:24:52 +09:00
SomberNight 6d6f5683cb fix: return type of QFileDialog.getSaveFileName() changed 2017-09-24 04:51:11 +02:00
SomberNight e43481aafc fix prev commit: name collisions with _() 2017-09-24 04:44:11 +02:00
SomberNight f1a4f998d2 fix: return type of QFileDialog.getOpenFileName() changed 2017-09-24 04:16:39 +02:00