BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:spesmilo/electrum

This commit is contained in:
ThomasV 2015-07-24 11:39:31 +02:00
parent 18d145cced 0f2d4bd375
commit f0e6f5bf64
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASE-NOTES
View File

@ -14,8 +14,8 @@
* Multisig transactions can be signed with Trezor. When you create * Multisig transactions can be signed with Trezor. When you create
the multisig wallet, just enter the xpub of your existing Trezor the multisig wallet, just enter the xpub of your existing Trezor
wallet. wallet.
* Transaction fees set manually in the GUI are retained when the user * Transaction fees set manually in the GUI are retained, including
uses the '!' shortcut. when the user uses the '!' shortcut.
* New 'email' plugin, that enables sending and receiving payment * New 'email' plugin, that enables sending and receiving payment
requests by email. requests by email.
@ -419,4 +419,3 @@ For an example, see Gavin's tutorial: https://gist.github.com/gavinandresen/3966
* (Feature) Added a label dialog after sending a transaction. * (Feature) Added a label dialog after sending a transaction.
* (Feature) Reworked receiving addresses; instead of a random selection from one of your receiving addresses a new widget will show listing unused addresses. * (Feature) Reworked receiving addresses; instead of a random selection from one of your receiving addresses a new widget will show listing unused addresses.
* (Chore) Removed server selection. With all the new server options a simple menu item does not suffice anymore. * (Chore) Removed server selection. With all the new server options a simple menu item does not suffice anymore.

2
lib/util.py
View File

@ -204,6 +204,8 @@ def time_difference(distance_in_time, include_seconds):
block_explorer_info = { block_explorer_info = {
'Biteasy.com': ('https://www.biteasy.com/blockchain', 'Biteasy.com': ('https://www.biteasy.com/blockchain',
{'tx': 'transactions', 'addr': 'addresses'}), {'tx': 'transactions', 'addr': 'addresses'}),
'Bitflyer.jp': ('https://chainflyer.bitflyer.jp',
{'tx': 'Transaction', 'addr': 'Address'}),
'Blockchain.info': ('https://blockchain.info', 'Blockchain.info': ('https://blockchain.info',
{'tx': 'tx', 'addr': 'address'}), {'tx': 'tx', 'addr': 'address'}),
'Blockr.io': ('https://btc.blockr.io', 'Blockr.io': ('https://btc.blockr.io',