Commit Graph

8525 Commits

Author SHA1 Message Date
Jon Layton 5325f842ab Merge commit '82e88cb' into test 2018-02-24 20:21:58 -06:00
Jon Layton 70509235ff Fix linux build instructions 2018-02-20 22:38:24 -06:00
Jon Layton 37c5d48f8e
Merge pull request #113 from BTCP-community/develop
Develop - SLIP0044
2018-02-20 10:04:13 -06:00
Jon Layton 52a116c87f
Merge pull request #104 from BTCP-community/slip-0044-zcl
SLIP-0044 BIP44 Path = 147 HD Wallets
2018-02-16 18:55:31 -06:00
Jon Layton 7de4ab489f SLIP-0044 BIP44 Path = 147 HD Wallets 2018-02-16 18:50:36 -06:00
Jon Layton 35745573c1 Remove electrum, fix readme + clean.sh 2018-02-16 18:49:18 -06:00
Jon Layton 68784ae22c Readme updates 2018-02-16 18:11:35 -06:00
Jon Layton 8569e2180f
Merge pull request #88 from pjain/master
* Fixed create-dmg.sh to use "electrum-zcl" name structure and "Elect…
2018-02-16 16:49:34 -06:00
Jon Layton d490fa0c5f
Merge pull request #95 from interbiznw/master
Removed /insight/ from these two
2018-02-11 22:04:57 -05:00
J62 ce7f2771da
Removed /insight/ from these two
#http://explorer.zclassic.org/insight/
#http://explorer1.zclassic.org/insight/

these two explorers are down for now but will setup without /insight/ at these same addresses
2018-02-11 17:09:20 -08:00
Jon Layton 7853c8741d
Merge pull request #85 from interbiznw/master
Update Block Explorers in util.py
2018-02-11 19:10:35 -05:00
Pankaj Jain 3f96fae26e * Fixed create-dmg.sh to use "electrum-zcl" name structure and "Electrum ZCL" for final DMG
* Added electrum-zcl back to tree
2018-02-09 12:56:25 -05:00
J62 dba660df22
Update util.py
added more explorers
2018-02-09 00:47:17 -08:00
J62 1d66190f3c
Update util.py
Updated explorer address
2018-02-09 00:30:24 -08:00
J62 c7f971fb88
Update util.py 2018-02-08 19:34:50 -08:00
J62 71402ae11c
Update util.py 2018-02-08 19:33:44 -08:00
J62 e3a6337035
Update util.py
Updated block explorers. We have http://eu1.zcl-explorer.com/insight    http://as1.zcl-explorer.com/insight  and http://zcl-explorer.com/insight/
2018-02-08 19:28:11 -08:00
Jon Layton a2909b3c7b
Merge pull request #84 from BTCP-community/revert_branding
Revert Branding
2018-02-07 19:52:09 -06:00
Jon Layton 4a117d1991 Revert "Merge pull request #79 from pjain/master"
This reverts commit 15e63e7108, reversing
changes made to 00b7e5824e.
2018-02-07 17:09:25 -06:00
Jon Layton 4ad134c6fe Revert "Add back electrum-zcl"
This reverts commit 7c860107da.
2018-02-07 17:06:59 -06:00
Jon Layton 419790d891 Revert "electrum-zcl script"
This reverts commit 9784ccbe4a.
2018-02-07 17:06:57 -06:00
Jon Layton 9784ccbe4a electrum-zcl script 2018-02-06 13:52:38 -06:00
Jon Layton 7c860107da Add back electrum-zcl 2018-02-06 13:52:01 -06:00
Jon Layton 15e63e7108
Merge pull request #79 from pjain/master
Renamed electrum to electrum-zcl to co-exist with exisiting installa…
2018-02-06 13:48:09 -06:00
EC2 Default User 00b7e5824e Add conda suggestion to readme 2018-02-06 07:57:28 +00:00
Pankaj Jain 437ef5238b Renamed electrum to electrum-zcl to cp-exist with exisiting installations of BTC variants of Electrum 2018-02-05 11:37:13 -05:00
ThomasV 82e88cb89d prepare release 3.0.6 2018-02-03 07:38:36 +01:00
Jon Layton 30db0b5485
Merge pull request #72 from BTCP-community/fix-spesmilo-links
Remove links to spesmilo/electrum
2018-02-02 13:23:59 -06:00
Jon Layton 111644648b Remove links to spesmilo/electrum 2018-02-02 13:20:28 -06:00
Jon Layton 69aa2fb830
Merge pull request #67 from zbindenren/docker
Add docker support
2018-02-02 02:05:30 -06:00
Jon Layton 1a36f4206f Add to knowledgebase, get version more reliably 2018-02-02 01:55:07 -06:00
Chris Sulmone dfff1e9405 Fixed headers url and a typo 2018-02-01 23:11:01 -06:00
Chris Sulmone 78e8b7b633 Upped version for 1.0.3 2018-02-01 21:23:57 -06:00
Chris Sulmone e5a8782fe5 Fixed up z->t transactions 2018-02-01 21:01:09 -06:00
SomberNight d76f36df70 ledger: mention "bitcoin" app when update is needed 2018-02-02 02:41:41 +01:00
Jon Layton 02e970f34f
Merge pull request #66 from zbindenren/pyblake2
add missing dependency in requirements.txt
2018-01-31 19:37:13 -06:00
Rene Zbinden eb7b9d04d6 fix tabs in dockerfile 2018-01-31 23:49:51 +01:00
Rene Zbinden 9d20443b90 add docker support 2018-01-31 23:46:50 +01:00
Rene Zbinden 0b1ca5a317 add missing dependency in requirements.txt 2018-01-31 23:34:06 +01:00
SomberNight cf82b1d9d5 follow-up 70aa1f1db9 2018-01-31 07:05:29 +01:00
SomberNight 29206852fb follow-up prev commit. better handling of p2sh-segwit. added comment to describe the problem for native segwit. 2018-01-31 07:05:13 +01:00
Neil Booth f0942a2535 Fix PNG file
Avoids libpng warning: iCCP: known incorrect sRGB profile
2018-01-31 07:04:57 +01:00
SomberNight 7b8b75c7d3 fix #3788
# Conflicts:
#	lib/transaction.py
2018-01-31 07:04:16 +01:00
SomberNight b0966671d7 fix #3790 2018-01-31 07:02:46 +01:00
SomberNight 64fa7dd6c3 fix #3783 2018-01-31 07:02:31 +01:00
Johann Bauer d0433c1539 Change number of zero when base unit changes 2018-01-29 20:57:23 +01:00
SomberNight ff38e90405 revert adding handling of 'blockchain.address.subscribe' in network.py 2018-01-29 20:57:11 +01:00
SomberNight c79662fbce websocket: migrate to scripthashes 2018-01-29 20:56:59 +01:00
racquemis d5e20d607e Handle invalid PIN on exporting private key
Prevent Android App from crashing when a wrong PIN is entered.
2018-01-29 20:56:46 +01:00
SomberNight 53fc343b4a setconfig rpcpassword: don't try to evaluate or reencode 2018-01-29 20:56:30 +01:00