Merge branch 'master' into master

This commit is contained in:
Kewde 2017-01-03 23:54:56 +01:00 committed by GitHub
commit 2ace024dd2
4 changed files with 68 additions and 5 deletions

BIN
img/tools/Bitcoin.svg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

BIN
img/tools/zcash.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -2263,7 +2263,6 @@
<li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
</ul>
<a class="anchor" name="notebook"></a>
<div class="page-header">
<h1><a href="#notebook" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Digital Notebook</h1>
@ -2277,6 +2276,7 @@
<div class="col-sm-4">
<div class="panel panel-success">
<div class="panel-heading">
<h3 class="panel-title">Laverna</h3>
</div>
<div class="panel-body">
@ -2377,11 +2377,74 @@
</div><!-- /.col-sm-4 -->
</div>
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://hastebin.com/" target="_blank">hastebin.com</a> - Haste is an open-source pastebin software written in node.js, which is easily installable in any network.</li>
</ul>
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://hastebin.com/" target="_blank">hastebin.com</a> - Haste is an open-source pastebin software written in node.js, which is easily installable in any network.</li>
</ul>
<a class="anchor" name="currency"></a>
<div class="page-header">
<h1><a href="#currency" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Anonymous cryptocurrencies</h1>
</div>
<div class="row">
<div class="col-sm-4">
<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title">Bitcoin</h3>
</div>
<div class="panel-body">
<p><img src="img/tools/Bitcoin.svg.png" alt="Bitcoin" align="right" style="margin-left:5px;">Bitcoin is a pseudonymous cryptocurrency that allows anyone to transact online without registering or giving away any personal information.</p>
<p>
<a href="https://bitcoin.org/">
<button type="button" class="btn btn-success">Website: bitcoin.org</button>
</a>
</p>
<p>OS: Cross-platform.</p>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title">ZCash</h3>
</div>
<div class="panel-body">
<p><img src="img/tools/zcash.png" alt="ZCash" align="right" style="margin-left:5px;">Zcash offers total payment confidentiality, while still maintaining a decentralized network using a public blockchain. Unlike Bitcoin, Zcash transactions automatically hide the sender, recipient, and value of all transactions on the blockchain.</p>
<p>
<a href="https://www.z.cash/">
<button type="button" class="btn btn-warning">Website: z.cash</button>
</a>
</p>
<p>OS: Linux.</p>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">ShadowCash</h3>
</div>
<div class="panel-body">
<p><img src="img/tools/shadowcash-104x108.png" alt="ShadowCash" align="right" style="margin-left:5px;">ShadowCash is an anonymous cryptocurency built on Bitcoin's codebase featuring additional cryptographic techniques that make transactions untraceable and unlinkable meaning malicious attackers are unable to identify sender or receiver. Also includes decentralized encrypted messaging similar to BitMessage.</p>
<p>
<a href="https://shadowproject.io/">
<button type="button" class="btn btn-info">Website: shadowproject.io</button>
</a>
</p>
<p>OS: Windows, Mac, Linux.</p>
</div>
</div>
</div>
</div>
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://www.dash.org/">Dash</a> - An open sourced, privacy-centric digital currency with instant transactions. It allows you to keep your finances private as you make transactions without waits.</li>
<li><a href="https://getmonero.org/">Monero</a> Monero is a secure, private, untraceable currency. It is open-source and freely available to all.</li>
</ul>
<a class="anchor" name="productivity"></a>
<div class="page-header">
<h1><a href="#productivity" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Productivity Tools</h1>