Commit Graph

3375 Commits

Author SHA1 Message Date
ThomasV 102bc204d5 hooks and workflow for 2of3 wallets 2014-04-06 21:38:53 +02:00
ThomasV f4b1621910 rename do_send as send. fixes #645 2014-04-05 18:35:15 +02:00
ThomasV 88d4dab6cb broadcast tx in a separate thread 2014-04-05 16:52:38 +02:00
ThomasV 60bea77d1e Merge pull request #644 from wozz/raise_window
Fix OS X issue: window start in foreground
2014-04-05 11:52:48 +02:00
ThomasV c24482c21a check seed in gui. fixes #622 2014-04-05 10:34:51 +02:00
ThomasV 38a59c0b37 re-enable seed tests. get_public_keys method 2014-04-05 10:08:54 +02:00
ThomasV 02c3bc131e fix and simplify tx serialization 2014-04-03 21:23:35 +02:00
ThomasV 8e644a4dc8 sort signatures for multisig 2014-04-03 20:48:31 +02:00
ThomasV 66e1e2707d get_pubkey_from_x 2014-04-03 16:11:28 +02:00
ThomasV 2be8c7f7ed add optional default value to text dialog 2014-04-03 15:36:31 +02:00
ThomasV a194edbefb account:simplification 2014-04-03 14:32:03 +02:00
ThomasV 4fb5296a92 account:simplification 2014-04-03 14:30:00 +02:00
ThomasV 9c34f9a1da fix: getpubkey 2014-04-03 14:17:42 +02:00
ThomasV f68ecb3e26 multisig accounts: sort pubkeys 2014-04-03 14:15:02 +02:00
Michael Wozniak 3cd4689083 Fix OS X issue: window start in foreground
When run from command line, the window starts behind all other windows.
raise_() will bring the window to the front.
2014-04-02 11:29:07 -04:00
ThomasV f522d6c36d sort pubkeys in multisig scripts 2014-04-02 14:04:39 +02:00
ThomasV 53b872acdf gui fix: send tx dialog 2014-04-02 13:18:00 +02:00
ThomasV df540cb241 move get_keyID to accounts 2014-04-01 23:53:07 +02:00
ThomasV 5c31263848 fix load_accounts 2014-04-01 19:10:59 +02:00
ThomasV 05fcdce018 fix redeem scripts 2014-04-01 19:10:35 +02:00
ThomasV 9fccf9c287 helper functions for bip32 derivations 2014-04-01 19:10:13 +02:00
Michael Wozniak 5288f6a933 Add @wozz GPG Public Key
pub  4096R/62C24FC7 2013-03-19 Michael Wozniak <mw@koh.ms>
      Key fingerprint = 3897 E067 2E32 A421 74B7  A840 038C 09F4 62C2 4FC7
sub  4096R/4B7BB803 2013-03-19 [expires: 2017-03-19]
2014-04-01 08:49:28 -04:00
ThomasV 9567af0219 fix CKD in p2sh accounts 2014-04-01 12:34:03 +02:00
ThomasV e082550f80 Merge branch 'master' of git://github.com/spesmilo/electrum 2014-04-01 11:25:29 +02:00
ThomasV 5a43b633d6 update bip32 accounts and wallet 2014-04-01 11:25:12 +02:00
ThomasV a92aae3306 Merge pull request #639 from toomyem/spesmilo
Added Bitcurex and Bitmarket exchanges
2014-04-01 11:18:14 +02:00
ThomasV e12ac7f9a1 Merge pull request #641 from wozz/640
Update create current unix time
2014-04-01 11:17:48 +02:00
Michael Wozniak b099930174 Update create current unix time
update method to create current unix time to be windows compatible

fix issue #640
2014-03-31 21:52:31 -04:00
Tomasz Machalski 0b8fc21db7 Added Bitcurex and Bitmarket exchanges 2014-03-31 21:02:21 +02:00
ThomasV ffc72e65df Merge branch 'master' of git://github.com/spesmilo/electrum 2014-03-31 17:18:26 +02:00
ThomasV 607e79cc43 Merge pull request #638 from wozz/exchange-hist-ven
Exchange Rate History - Add APIs
2014-03-31 17:18:12 +02:00
ThomasV 9663600d5d update bip32 derivations, using xpriv and xpub serialization format 2014-03-31 12:16:15 +02:00
ThomasV 91ba04c4d7 update bip32 derivations, using xpriv and xpub serialization format 2014-03-31 12:12:29 +02:00
ThomasV 328432f5f4 update bip32 derivations, using xpriv and xpub serialization format 2014-03-31 12:00:57 +02:00
Michael Wozniak a3b88ca3dc Exchange Rate History - Add APIs
Add API for Winkdex and BitcoinVenezuela
2014-03-30 20:39:37 -04:00
ThomasV 33b94cd60e add error field in tx, because exceptions cannot be passed by plugins 2014-03-28 17:37:31 +01:00
ThomasV 4f6ac1d613 Merge pull request #631 from jisqyv/jischanges
Updates for merchant.py
2014-03-28 17:19:48 +01:00
ThomasV 6e26fb0198 remove redundant definition of Timer class 2014-03-28 17:06:58 +01:00
ThomasV c5c1ed11f0 better waiting dialog, with Qt signals 2014-03-28 17:05:34 +01:00
Jeffrey I. Schiller 35f1455970 Fixes to merchant.py
Correct order of arguments to create_watching_only_wallet and correct
usage of sqlite3
2014-03-28 10:46:23 -04:00
ThomasV 93ead1a90e Merge pull request #634 from dpdtex/FiatPrice
Show Current Fiat Price in Status Panel
2014-03-28 10:58:08 +01:00
Darrin Daigle 5619859386 Streamlined code - modified two procs (get_fiat_status_text and fiat_dialog) to call exchange API only once instead of twice (as recommended by wozz). 2014-03-27 22:00:23 -05:00
Darrin Daigle 9fb7fd5803 Cleaned up Exchange Rate plugin: more efficient code and more intuitive names for the get fiat balance/price procedures. Created new procedure used for updating the fiat balance & price on the status panel. Enhancement: status panel on bottom left now shows the current BTC price (eg, 1 BTC~573.45 USD). 2014-03-27 15:30:24 -05:00
ThomasV f1cc259b75 Merge pull request #632 from dpdtex/FixAccountComboWidth
Fixed bug with width of account combo box on bottom right.
2014-03-27 16:42:18 +01:00
Darrin Daigle ecd013bbb7 Fixed size issue on account combo box in status panel. If you started Electrum with a wallet that did not have imported keys (therefore the account combo box didn't show), then you opened a wallet that had imported keys, the combo box was not wide enough to correctly display the combo box items. 2014-03-27 10:23:30 -05:00
ThomasV be7d0445a6 Merge pull request #625 from dpdtex/DialogTitles
fixed title on 3 dialog boxes (they were showing "python" as title)
2014-03-26 18:52:13 +01:00
ThomasV 8eeb5503ad Merge pull request #628 from rdymac/are-frozen
add white space before BTC frozen message
2014-03-26 18:16:45 +01:00
rdymac 383763e24b add white space before BTC frozen message
Added a white space before BTC in the not enough funds frozen message.

The ‘Not enough funds…’ message does not disappear even after clicking
the clear button. Only changing the amount to send restores the
‘Balance’ message
2014-03-26 17:47:22 +01:00
Darrin Daigle dec5e351c0 fixed title on 3 dialog boxes (they were showing "python" as title) 2014-03-25 17:08:23 -05:00
ThomasV 437fdf4760 Merge pull request #623 from dpdtex/master
Add ability to specify fiat amount when sending bitcoin
2014-03-25 18:44:23 +01:00