Commit Graph

5033 Commits

Author SHA1 Message Date
Neil 9a823f5fe6 Merge pull request #1342 from kyuupichan/retain_user_fees
Once a user inputs a fee, retain it.
2015-07-03 20:23:06 +09:00
Neil Booth aa6de86c27 Once a user inputs a fee, retain it.
It has long been a minor annoyance that this isn't the
default behaviour.  Semantics are as follows:

- Fees are calculated automatically, as usual, and shown
  in black
- If the user inputs a fee, it is retained, and shown in
  blue to indicate it is user-overridden
- The user can switch back to automatic fee calculation mode
  in two ways: press Clear, or blank out the fee field
- User fees are also cleared by do_clear(), for instance when
  the payment is sent

I have checked all usage combinations I could think of, including
the ! case, and all work in a sensible and natural fashion.

This also fixes issue #995.
2015-07-03 20:14:12 +09:00
ThomasV 250bb03034 Merge pull request #1337 from kyuupichan/auto_connect
Suggested auto_connect daemon mode fix for #1336
2015-07-03 09:58:57 +02:00
ThomasV 9e84d12a6f Merge pull request #1339 from kyuupichan/daemon
Avoid string representation issues, fix #1338
2015-07-03 09:41:21 +02:00
ThomasV 9fc9c5e4f4 Merge pull request #1340 from kyuupichan/dead_code
Remove apparently dead code.
2015-07-03 09:36:59 +02:00
Neil Booth 930304e46b Remove apparently dead code. 2015-07-03 13:57:42 +09:00
Neil Booth 389c8e8a8d Only write config file once. 2015-07-03 13:56:17 +09:00
Neil Booth 3a50c78a47 Avoid string representation issues
Caused by unicode vs non-unicode strings.
Fixes #1338
2015-07-03 13:53:15 +09:00
Neil Booth 5acbe00cbf Suggested auto_connect daemon mode fix for #1336 2015-07-03 11:50:53 +09:00
ThomasV 306756b42d Merge pull request #1334 from romanz/master
travis: use Tox for test automation
2015-07-02 16:55:25 +02:00
ThomasV ff46d6b7d4 Merge branch 'bfix' 2015-07-02 16:51:25 +02:00
Roman Zeyde 1eccadfc13 travis: use Tox for test automation 2015-07-02 17:25:02 +03:00
ThomasV 65e7667eba build reverse history index, to know when a transaction can be removed 2015-07-02 16:07:04 +02:00
ThomasV e8dd11161b Merge pull request #1333 from romanz/master
travis: add code coverage report
2015-07-02 15:30:19 +02:00
ThomasV 616becd9a8 move openalias from plugins to core 2015-07-02 12:44:53 +02:00
Roman Zeyde 7ae8bb88b4 travis: add code coverage report 2015-07-02 11:58:30 +03:00
ThomasV 90d32038fa Merge branch 'kyuupichan-synchronizer-unthread' 2015-07-02 09:25:43 +02:00
ThomasV fa2de58c90 redo fixes for 1324 2015-07-02 09:22:59 +02:00
ThomasV ccd07c6a80 Merge branch 'synchronizer-unthread' of https://github.com/kyuupichan/electrum into kyuupichan-synchronizer-unthread 2015-07-02 09:20:51 +02:00
ThomasV 0c37009cdb fix is_address (forgot p2sh) 2015-07-02 08:53:17 +02:00
ThomasV c0858f314f Merge branch 'master' of git://github.com/spesmilo/electrum 2015-07-02 08:48:53 +02:00
ThomasV cf5328b143 do not accet testnet addresses in bitcoin.is_address 2015-07-02 08:48:48 +02:00
ThomasV 516e469d3c Merge pull request #1332 from romanz/master
fix small typos at lib/interface.py and lib/commands.py
2015-07-02 08:37:42 +02:00
Roman Zeyde daee02e22d commands: fix typo
rename "sec" to "privkey"
2015-07-01 18:15:35 +03:00
Roman Zeyde 9c06bee8c7 interface: slow_parse() is not defined for X509 2015-07-01 16:54:11 +03:00
ThomasV 604d5d432c sanitize server at the interface level (follow up to issue #1330) 2015-07-01 09:09:00 +02:00
ThomasV 0ac3aebb88 fix proxy setting issue #1330 2015-07-01 08:45:47 +02:00
Neil Booth d0308010da Client-side fix for #1324
Print messages rather than throwing uncaught exceptions that kill the
thread.
I cannot fix the server side as I have no way to test it.
2015-06-30 23:14:05 +09:00
ThomasV dbdbdc8792 Merge pull request #1327 from romanz/master
transaction_dialog: allow plugins manipulate transaction sharing buttons
2015-06-29 18:10:41 +02:00
Roman Zeyde a0c891d73f transaction_dialog: allow plugins manipulate transaction sharing buttons 2015-06-29 17:00:31 +03:00
Neil Booth a23247634c Remove some unused vars. 2015-06-29 10:44:27 +09:00
ThomasV e994736bf5 trezor: print more info, in order to fix issue #1306 2015-06-28 21:55:01 +02:00
ThomasV 1427d96249 trezor: simplify get_client 2015-06-28 19:59:27 +02:00
ThomasV ed1001bf8b print trezor error message 2015-06-28 19:43:46 +02:00
ThomasV 9dfe8ff847 tx window: keep a single close message, and raise window after signing 2015-06-28 10:37:08 +02:00
ThomasV 4cf97d9ab8 rm debugging line 2015-06-28 10:26:18 +02:00
ThomasV 98d0ff7536 trezor: move signing logic from wallet class to plugin 2015-06-28 10:20:54 +02:00
ThomasV 1919d5d63c fix wizard: remove vbox0, improve text 2015-06-28 08:52:16 +02:00
ThomasV 437eff7db9 Merge pull request #1323 from wozz/add_seed_scroll
Add seed scroll
2015-06-28 08:39:17 +02:00
Michael Wozniak 4338944e3a remove unnecessary lines 2015-06-27 18:49:21 -04:00
Michael Wozniak b7ea10609c add seed scroll for multisig wallets 2015-06-27 18:47:25 -04:00
ThomasV 1e9e3f1493 Merge pull request #1322 from wozz/multisig-restore
update restore multisig to add wallet type
2015-06-27 22:29:57 +02:00
Michael Wozniak 523aa7c380 update restore multisig to add type 2015-06-27 16:12:15 -04:00
ThomasV 765ef338ec fix multisig seed detection 2015-06-27 21:53:55 +02:00
ThomasV 6afb7b21d0 Merge pull request #1320 from kyuupichan/button_split
Split tx dialog buttons
2015-06-27 16:09:15 +02:00
ThomasV 3a9bf8430e fix send button 2015-06-27 15:53:59 +02:00
ThomasV f157a990c7 Merge branch 'master' of git://github.com/spesmilo/electrum 2015-06-27 15:22:48 +02:00
ThomasV 118052d815 v2.4 will require protocol v0.10 2015-06-27 15:22:34 +02:00
ThomasV 56b3c98332 generic m of n multisig 2015-06-27 12:43:29 +02:00
ThomasV 14e9cf8442 Merge pull request #1321 from romanz/master
README: move to reST format
2015-06-27 12:16:44 +02:00