Commit Graph

4988 Commits

Author SHA1 Message Date
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
Roman Zeyde a34169d81f README: move to reST format 2015-06-27 11:05:10 +03:00
Roman Zeyde b89c0144a2 remove "mki18n.py" references 2015-06-27 10:48:57 +03:00
Neil Booth c35485c1c2 Split tx dialog buttons
The "actions" (sign, broadcast, send to cosigner, verify GA instant)
go on the RHS next to the "Cancel" button.

Copy, QR code and save go on the left.
2015-06-27 11:48:27 +09:00
Neil Booth 547886d6f1 Input tx index looks better left-aligned after all 2015-06-27 11:01:42 +09:00
Neil Booth 6c25f637b9 Wrapper func to create and show a TxDialog
Add prompt_if_unsaved as explicit argument.
Tested with cosigner pool plugin.
2015-06-27 10:56:01 +09:00
ThomasV f8b5c66284 Merge pull request #1319 from LedgerHQ/ledger-fixed-2.3.2
Ledger fixed 2.3.2
2015-06-26 17:46:35 +02:00
ThomasV 37d5e3b42a version 2.3.3, release notes 2015-06-26 14:35:22 +02:00
Neil Booth 3d48a2d842 More tx dialog improvements
- Show Close if no action to perform, otherwise Cancel
- Add some strings for translation
- Make input hash/index constant width; previously a
  3-digit index bumped the address a whole tabstop over
  compared to the 1-digit indices
2015-06-26 20:15:51 +09:00
ThomasV 0a8e8ec906 Merge pull request #1316 from kyuupichan/tx_dialog3
Distinguish receiving and change addrs in TxDialog
2015-06-26 10:48:52 +02:00
Neil a636aa07b3 Merge pull request #1318 from kyuupichan/save_desc
Save the description to the wallet on broadcasting
2015-06-26 15:47:05 +09:00
Neil Booth 7e36555ed8 Save the description to the wallet on broadcasting
Resolves a long-standing bug with view-before-broadcast
2015-06-26 15:40:41 +09:00
Neil 1c186cd9b6 Merge pull request #1317 from kyuupichan/pubkey
Add my own public key.
2015-06-26 14:51:51 +09:00
Neil Booth b59063c086
Add my own public key. 2015-06-26 14:49:02 +09:00
Neil Booth 820f435a9a Distinguish receiving and change addrs in TxDialog
Show change in yellow, receiving in lightgreen (as now).
Numbers are more readable with whitespace.
2015-06-26 11:55:20 +09:00
ThomasV c06f9ab034 Merge pull request #1314 from kyuupichan/tx_dialog2
Have show-before-broadcast defer password request
2015-06-25 12:38:10 +02:00
Neil Booth 56488daf04 Have show-before-broadcast defer password request
Show-before-send currently asks for the password
and creates a signed tx before showing anything.

This is a little unnerving as you can't see what
you're being asked to sign.

This patch does a few things:

- Adds a description label to the TX dialog
- You see the tx before being asked for password;
  that is only requested on pressing Sign
- in show-before-broadcast mode, the Send button
  text is instead "Show...".  Hook up this button
  text change to the prefs dialog too.
- Remove many redundant imports.  In particular
  PyQ4 is checked in main_window.py so no need
  in tx_dialog too.

Note I had to remove disabling of the Sign button,
because if the user presses "cancel" nothing will
re-enable it.
2015-06-25 15:58:40 +09:00
BTChip 3a22fe758f Only rescan the dongle when it has been disconnected 2015-06-25 08:17:45 +02:00
ThomasV 7e0a80b697 Merge pull request #1275 from kyuupichan/tx_dialog_send_tx
Have transaction_dialog use send_tx()
2015-06-24 11:15:30 +02:00
ThomasV fdd43bd5ad fix issue in f307b18546 2015-06-24 09:35:54 +02:00
ThomasV f307b18546 Merge pull request #1268 from kyuupichan/blockchain_nothread
Make the blockchain class not a thread
2015-06-24 09:00:52 +02:00
BTChip 2b307ce24f Use format_satoshis_plain instead of format_satoshis to avoid locale separator issues 2015-06-24 00:39:39 +02:00
ThomasV 56f8fc62f9 fix 1312 2015-06-23 16:58:21 +02:00
ThomasV 74bdc7a7fa Merge pull request #1308 from kyuupichan/issue_1304
View contact address on block explorer menu item
2015-06-23 14:23:07 +02:00
ThomasV f894af90d7 fix deserialize_proxy. fixes #1309 2015-06-23 14:22:10 +02:00
Neil Booth 175081d9fc View contact address on block explorer menu item
Resolves issue #1304
2015-06-21 09:57:38 +09:00
ThomasV 74d26f5bdc better error message 2015-06-15 10:52:03 +02:00
ThomasV 5c59b017ae Merge branch 'master' of git://github.com/spesmilo/electrum 2015-06-14 11:39:51 +02:00
ThomasV 0682695da9 version 2.3.2 2015-06-14 11:39:41 +02:00
ThomasV a4e9df3db9 Merge pull request #1297 from LedgerHQ/ledger-windows-fix
HW.1 fix pack
2015-06-14 11:37:01 +02:00
BTChip eed37e82d2 Support Ledger 2FA Security Card and prepare for new encoding format 2015-06-14 11:25:26 +02:00
ThomasV 00af3b394b Merge pull request #1280 from kyuupichan/BIP-LI01
Implement BIP-LI01.
2015-06-14 08:08:55 +02:00
ThomasV ec9cdfaf48 blockchain: restore call to set_local_height, forgotten in previous commit 2015-06-13 16:45:42 +02:00
ThomasV d09a10e0f7 fix is_used for unmatured tx 2015-06-13 16:40:50 +02:00
ThomasV 99c50aa31f Merge pull request #1296 from romanz/master
Fix few small issues.
2015-06-13 16:38:52 +02:00
Roman Zeyde 90076b0b79 util: add print_msg() method to DaemonThread
it is used by at synchornizer.py, line 173
2015-06-13 16:58:08 +03:00
Roman Zeyde c324d21107 transaction: added missing import
for "traceback.print_exc(file=sys.stdout)" statement at line 361
2015-06-13 16:58:08 +03:00
Roman Zeyde cb4d3a78b4 verifier: fix typo 2015-06-13 16:58:08 +03:00
ThomasV cf5d3e956b Merge pull request #1295 from romanz/master
travis: use pytest (due to better test discovery)
2015-06-13 14:05:09 +02:00
Roman Zeyde d27efaad82 travis: use pytest (due to better test discovery) 2015-06-13 14:29:23 +03:00
ThomasV 12feb4cf9c Merge pull request #1294 from romanz/master
bitcoin: remove dead code
2015-06-13 13:25:28 +02:00
BTChip db68dcbc14 Get rid of libusb dependency 2015-06-13 11:58:57 +02:00
Roman Zeyde 6bb9ee0cf7 bitcoin: remove dead code 2015-06-13 08:34:56 +03:00
ThomasV 7a3ddfc6a4 version 2.3.1 2015-06-12 20:22:02 +02:00
ThomasV 10740470cc fix requests_dir bug 2015-06-12 20:18:06 +02:00