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
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