Commit graph

4048 commits

Author SHA1 Message Date
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
dpdtex
5fb8036dd5 Merge pull request #4 from dpdtex/temp3
wrapped strings with  _("string text") to enable language translation
2014-03-25 11:45:22 -05:00
Darrin Daigle
eccb78c3e6 wrapped strings with _("string text") to enable language translation 2014-03-25 11:43:21 -05:00
dpdtex
055e178221 Merge pull request #3 from dpdtex/temp1
fixed issue when exchange rate not available (eg, no connection)
2014-03-24 11:07:48 -05:00
Darrin Daigle
dea58fcb49 fixed issue when exchange rate not available (eg, no connection) 2014-03-24 11:06:20 -05:00
dpdtex
e2bd535000 Merge pull request #2 from dpdtex/temp1
better handling of very small fiat numbers and mBTC
2014-03-23 23:18:33 -05:00
Darrin Daigle
284bcc1e5b better handling of very small fiat numbers and mBTC 2014-03-23 23:17:20 -05:00
dpdtex
041ed3ad4a Merge pull request #1 from dpdtex/temp1
Bug Fixes
2014-03-23 14:59:13 -05:00
Darrin Daigle
7bfd170ad9 check if fiat button exists on send tab before updating its caption with the newly selected fiat currency 2014-03-23 13:33:54 -05:00
Darrin Daigle
bc3bcc20dc check to see if fiat button already exists on send tab before telling user they must restart Electrum to see it 2014-03-23 12:58:42 -05:00
Darrin Daigle
669d8041e4 Add ability to specify fiat amount when sending bitcoin. 2014-03-22 23:04:06 -05:00
ThomasV
bf8bbfb2c0 Merge branch 'master' of git://github.com/spesmilo/electrum 2014-03-22 11:04:57 +01:00
ThomasV
0f44ebac55 handle timeout in peers script 2014-03-22 11:04:52 +01:00
ThomasV
15e2dcd8b5 Merge pull request #620 from wozz/exchange-rate-old-python
fix error with Decimal in older python versions
2014-03-18 11:09:58 +01:00
Michael Wozniak
e6175c6f57 fix error with Decimal in older python versions 2014-03-17 22:03:48 -04:00
ThomasV
25ccd2541a Merge branch 'master' of git://github.com/spesmilo/electrum 2014-03-16 20:24:10 +01:00
ThomasV
9420afab05 remove encrypt/decrypt from release notes 2014-03-16 20:23:54 +01:00
ThomasV
7cc04f383b Merge pull request #617 from flatfly/patch-3
Remove unused import
2014-03-16 20:18:22 +01:00
ThomasV
f92b483942 disable encrypt/decrypt 2014-03-16 16:35:12 +01:00
flatfly
2a28fa07e3 Update daemon.py 2014-03-16 15:04:40 +01:00
ThomasV
a6f9b713f9 fix setup 2014-03-16 14:02:21 +01:00
Eagle[TM]
e81385fc05 update server list 2014-03-16 12:18:38 +01:00
ThomasV
9230482870 set default verbosity to false, because of daemon 2014-03-16 12:13:52 +01:00
ThomasV
7dd296273f move daemon spawning code into NetworkProxy class 2014-03-16 12:00:08 +01:00
ThomasV
0bb16f0836 add daemon port to config 2014-03-16 06:28:16 +01:00
ThomasV
8395bfe67f disable bip32 option before release 2014-03-15 11:10:06 +01:00
ThomasV
c0378a5ba0 fix getservers: wait until they are available 2014-03-15 11:04:11 +01:00
ThomasV
1b2f75bb84 do not display tx amounts in an offline wallet 2014-03-15 10:01:25 +01:00