joshua/dash-docs
1
0
Fork 0
mirror of https://github.com/seigler/dash-docs synced 2025-07-27 09:46:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge PRs #887, #900, #902

Browse source 
- #887: Replacing MultiBit Classic with MultiBit HD
- #900: Community: Add Bitcoin Embasy Amsterdam
- #902: Update Mycelium description
This commit is contained in:
David A. Harding 2015-06-18 07:58:27 -04:00
commit 0ff4a25a2c
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
30 changed files with 145 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

18
_templates/choose-your-wallet.html
View file

@ -31,17 +31,17 @@ wallets:
privacyaddressreuse: "checkpassprivacyaddressrotation"
privacydisclosure: "checkpassprivacydisclosurefullnode"
privacynetwork: "checkpassprivacynetworksupporttorproxy"
- multibit:
title: "MultiBit"
titleshort: "MultiBit"
- multibithd:
title: "MultiBit HD"
titleshort: "MultiBit HD"
compat: "desktop windows mac linux"
level: 2
platform:
desktop:
text: "walletmultibit"
text: "walletmultibithd"
link: "https://multibit.org"
source: "https://github.com/jim618/multibit"
screenshot: "multibit.png"
source: "https://github.com/bitcoin-solutions/multibit-hd"
screenshot: "multibithd.png"
os:
- windows
- mac
@ -51,11 +51,11 @@ wallets:
validation: "checkpassvalidationspvp2p"
transparency: "checkpasstransparencyopensource"
environment: "checkfailenvironmentdesktop"
privacy: "checkfailprivacyweak"
privacy: "checkpassprivacybasic"
privacycheck:
privacyaddressreuse: "checkfailprivacyaddressrotation"
privacyaddressreuse: "checkpassprivacyaddressrotation"
privacydisclosure: "checkfailprivacydisclosurespv"
privacynetwork: "checkfailprivacynetworknosupporttor"
privacynetwork: "checkpassprivacynetworksupporttorproxy"
- armory:
title: "Armory"
titleshort: "Armory"

3
_templates/community.html
View file

@ -156,7 +156,8 @@ id: community
<div>
<h3 id="netherlands"><img src="/img/flags/NL.png" alt="Dutch flag">Netherlands</h3>
<p>
<a href="http://stichtingbitcoin.nl/">Stichting Bitcoin Nederland</a>
<a href="http://stichtingbitcoin.nl/">Stichting Bitcoin Nederland</a><br>
<a href="https://bitcoinembassy.nl/">Bitcoin Embassy Amsterdam</a>
</p>
</div>
</div>

2
_templates/development.html
View file

@ -50,7 +50,7 @@ id: development
<li><a href="https://github.com/hivewallet">Hive</a> - A fast user-friendly SPV Bitcoin client.</li>
<li><a href="https://github.com/libbitcoin/libbitcoin/">libbitcoin</a> - An asynchronous C++ library for Bitcoin.</li>
<li><a href="https://en.bitcoin.it/wiki/Libblkmaker#For_developers">libblkmaker and python-blkmaker</a> - Client side libraries for the getblocktemplate mining protocol.</li>
<li><a href="https://multibit.org/">MultiBit</a> - A thin SPV international Bitcoin client for desktops.</li>
<li><a href="https://multibit.org/">MultiBit HD</a> - A thin SPV international Bitcoin client for desktops.</li>
<li><a href="https://github.com/NicolasDorier/NBitcoin">NBitcoin</a> - A cross-platform .NET Bitcoin library. (Mac,IOS,Android,WP,Tablets,Mono,Desktop)</li>
<li><a href="https://github.com/libbitcoin/obelisk/">obelisk</a> - A libbitcoin-based blockchain query server.</li>
<li><a href="https://github.com/jgarzik/picocoin">picocoin</a> - A tiny bitcoin library, with lightweight client and utils.</li>

31
_templates/press.html
View file

@ -225,41 +225,10 @@ What is Bitcoin - Funke<br>
<a href="https://www.youtube.com/watch?v=Um63OQz3bjo&amp;feature=player_embedded" target="_blank"><img src="/img/press/video/whatisbitcoin.jpg" alt="what is Bitcoin"></a><br>
What is Bitcoin - Weusecoins<br>
<a href="https://www.youtube.com/watch?v=Um63OQz3bjo&amp;feature=player_embedded" target="_blank">{{ page.dialogs.materialvideoyoutube }}</a><br>
<a href="https://www.weusecoins.com/en/materials" target="_blank">{{ page.dialogs.materialvideoformat }}</a>
</div>
</div>
{% endif %}
<div class="press-pictures">
<h2 id="pictures">{% translate materialpicture %}</h2>
<div>
<a href="https://docs.google.com/uc?export=view&amp;id=0B4t9VJLm_PWhckxzRm5vS2ZtOWM" target="_blank"><img src="/img/press/picture/bitcoin_kiez.jpg" alt="Bitcoin Kiez sign"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4bUswMm5UWS1XakU" target="_blank"><img src="/img/press/picture/bitcoin_logo_plain.png" alt="Bitcoin logo"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4Z2FaVTZ0NmRjSmc" target="_blank"><img src="/img/press/picture/bitcoin_logo_qt.png" alt="Bitcoin Qt logo"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bxtcokiuvb4fZjlvNjhTN2Q4aUE" target="_blank"><img src="/img/press/picture/bitcoin_logo_3d.png" alt="3D Bitcoin artwork by Eivind Nag" title="3D Bitcoin artwork by Eivind Nag"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bxtcokiuvb4fa3QweHlqTTE2U3c" target="_blank"><img src="/img/press/picture/bitcoin_logo_3d_light.png" alt="Bitcoin 3D" title="3D Bitcoin artwork by Eivind Nag"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bxtcokiuvb4fVTVhcDQzRVNBelk" target="_blank"><img src="/img/press/picture/bitcoin_logo_3d_perspective.png" alt="Bitcoin 3D" title="3D Bitcoin artwork by Eivind Nag"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bxtcokiuvb4fcVQzWkNHYm5jbE0" target="_blank"><img src="/img/press/picture/bitcoin_logo_3d_wood.png" alt="Bitcoin 3D" title="3D Bitcoin artwork by Eivind Nag"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4NjlNLVM2dzJXLUk" target="_blank"><img src="/img/press/picture/bitcoin_casascius_holograph.png" alt="Bitcoin Casascius holograph coin"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bw3qRtSO3WwtMHByaTB1NmNSdTg" target="_blank"><img src="/img/press/picture/bitcoin_cybrbeast4.png" alt="Bitcoin Cybrbeast 3D artwork"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bw3qRtSO3WwtbFhyb0YybHdhWEU" target="_blank"><img src="/img/press/picture/bitcoin_cybrbeast1.png" alt="Bitcoin Cybrbeast 3D artwork"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bw3qRtSO3WwtV1BCLUQ1cHhOaDA" target="_blank"><img src="/img/press/picture/bitcoin_cybrbeast2.png" alt="Bitcoin Cybrbeast 3D artwork"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bw3qRtSO3WwtYmhXTDUxRHlUY2M" target="_blank"><img src="/img/press/picture/bitcoin_cybrbeast5.png" alt="Bitcoin Cybrbeast 3D artwork"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bw3qRtSO3WwtT2ZLUzZyYUlJaGs" target="_blank"><img src="/img/press/picture/bitcoin_cybrbeast3.png" alt="Bitcoin Cybrbeast 3D artwork"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bw3qRtSO3WwtVnV1X1ktLW83Uzg" target="_blank"><img src="/img/press/picture/bitcoin_wood.png" alt="Bitcoin wood artwork"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0Bw3qRtSO3WwtRkxSRDZtQXFTbWc" target="_blank"><img src="/img/press/picture/bitcoin_casascius_metal.png" alt="Bitcoin Casascius metal coin"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4MG9oY1hTSTRBMHM" target="_blank"><img src="/img/press/picture/bitcoin_logo_euro.png" alt="Bitcoin euro"></a>
<a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4RUZwY1Bzd3ZMa1E" target="_blank"><img src="/img/press/picture/bitcoin_logo_gold.png" alt="Bitcoin gold"></a>
</div>
<a href="#" onclick="materialShow(event);">{% translate materialpicturemore %}</a>
</div>
{% if page.lang == 'en' %}
<div class="press-quotes">
<h2 id="quotes">{{ page.dialogs.materialquote }}</h2>

3
_templates/support-bitcoin.html
View file

@ -19,8 +19,7 @@ id: support-bitcoin
<h2 id="translate"><img class="titleicon" src="/img/icons/ico_translate.svg" alt="Icon" />{% translate translate %}</h2>
<p>{% translate translatetxt %}</p>
<p><a href="https://www.transifex.com/projects/p/bitcoin/">Bitcoin Core</a> - <a href="https://www.transifex.com/projects/p/bitcoinorg/">Bitcoin.org</a> - <a href="https://en.bitcoin.it/wiki/Bitcoin.it_Wiki">Bitcoin Wiki</a> - <a href="https://www.transifex.com/projects/p/bitcoin-wallet/">Bitcoin Wallet (Android)</a> - <a href="http://translate.multibit.org/">MultiBit</a> - <a href="https://crowdin.com/project/electrum">Electrum</a> - <a href="https://github.com/hivewallet/hive-osx/wiki/I18n-guide">Hive</a></p>
<p><a href="https://www.transifex.com/projects/p/bitcoin/">Bitcoin Core</a> - <a href="https://www.transifex.com/projects/p/bitcoinorg/">Bitcoin.org</a> - <a href="https://en.bitcoin.it/wiki/Bitcoin.it_Wiki">Bitcoin Wiki</a> - <a href="https://www.transifex.com/projects/p/bitcoin-wallet/">Bitcoin Wallet (Android)</a> - <a href="https://crowdin.com/project/multibit-hd">MultiBit HD</a> - <a href="https://crowdin.com/project/electrum">Electrum</a> - <a href="https://github.com/hivewallet/hive-osx/wiki/I18n-guide">Hive</a></p>
<h2 id="develop"><img class="titleicon" src="/img/icons/ico_conf.svg" alt="Icon" />{% translate develop %}</h2>
<p>{% translate developtxt %}</p>