Merge remote-tracking branch 'upstream/master' into pr_tox-revert

This commit is contained in:
tya99 2018-11-22 23:44:55 +10:30
commit 60de6c099e
No known key found for this signature in database
GPG Key ID: 9C9954F88E388859
8 changed files with 87 additions and 90 deletions

View File

@ -2,7 +2,7 @@
## Description
Issue: #none
Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line -->
<!--
## Screenshots

View File

@ -2,23 +2,12 @@
layout: default
---
<style type="text/css" media="screen">
.container {
margin: 10px auto;
max-width: 600px;
text-align: center;
}
h1 {
margin: 30px 0;
font-size: 4em;
line-height: 1;
letter-spacing: -1px;
}
</style>
<div class="container">
<div class="container text-center">
<h1>404</h1>
<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found.</p>
<p>We're redirecting you to the home page in 5 seconds. It this doesn't work, <a href="{{ site.url }}">click here.</a></p>
</div>
<script>
window.setTimeout(function(){ window.location = "{{ site.url }}"; },5000);
</script>

View File

@ -155,7 +155,7 @@
<a class="dropdown-item" href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/">Email</a>
<a class="dropdown-item" href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io">Facebook</a>
<a class="dropdown-item" href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO">Twitter</a>
<a class="dropdown-item" href="https://plus.google.com/share?url=https://www.privacytools.io">Google+</a>
<a class="dropdown-item" href="http://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io">Mastodon</a>
<a class="dropdown-item" href="http://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance">reddit</a>
<a class="dropdown-item" href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance">LinkedIn</a>
<a class="dropdown-item" href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance">StumbleUpon</a>

View File

@ -17,7 +17,7 @@ $share-btn-active: #e2e2e2;
/* Social */
$twitter: #55acee;
$google: #dd4b39;
$mastodon: #3088d4;
$facebook: #3b5998;
$stumbleupon: #eb4823;
$reddit: #ff5700;

View File

@ -21,6 +21,10 @@ a,
}
}
.card-ol {
padding-left: 1.25rem;
}
/*.card-success, */
.card-success {
.card-header {
@ -69,7 +73,6 @@ a,
}
}
.anchor {
&:target {
margin-top: -4rem;
@ -111,7 +114,7 @@ a,
}
.twitter { background: $twitter; }
.google-plus { background: $google; }
.mastodon { background: $mastodon; }
.facebook { background: $facebook; }
.stumbleupon { background: $stumbleupon; }
.reddit { background: $reddit; }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@ -65,11 +65,11 @@ layout: default
{% include panel.html color="danger"
title="Five Eyes"
body='
1. Australia <div class="float-right"><span class="flag-icon flag-icon-au"></span></div>
<br /> 2. Canada <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div>
<br /> 3. New Zealand <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div>
<br /> 4. United Kingdom <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div>
<br /> 5. United States of America <div class="float-right"><span class="flag-icon flag-icon-us"></span></div>
<li>1. Australia <div class="float-right"><span class="flag-icon flag-icon-au"></span></div></li>
<li>Canada <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div></li>
<li>New Zealand <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div></li>
<li>United Kingdom <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div></li>
<li>United States of America <div class="float-right"><span class="flag-icon flag-icon-us"></span></div></li>
'
%}
@ -860,7 +860,7 @@ layout: default
<li><a href="https://ffprofile.com/">ffprofile.com</a> - Helps you to create a Firefox profile with the defaults you like.</li>
<li><a href="http://kb.mozillazine.org/Category:Security_and_privacy-related_preferences">mozillazine.org</a> - Security and privacy-related preferences. </li>
<li><a href="https://github.com/pyllyukko/user.js">user.js Firefox hardening stuff</a> - This is a user.js configuration file for Mozilla Firefox that's supposed to harden Firefox's settings and make it more secure.</li>
<li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox addon to alter built-in privacy settings easily with a toolbar panel.</li>
<li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox add-on to alter built-in privacy settings easily with a toolbar panel.</li>
</ul>
<h1 id="email" class="anchor"><a href="#email"><i class="fas fa-link anchor-icon"></i></a> Privacy-Conscious Email Providers - No Affiliates</h1>
@ -999,7 +999,7 @@ layout: default
<td><span class="flag-icon flag-icon-no"></span> Norway</td>
<td data-value="1000">1 GB</td>
<td data-value="20">$ 19.95</td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-primary">Yes</span></td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
@ -1228,7 +1228,7 @@ layout: default
title="Mobile: Signal"
image="assets/img/tools/Signal.png"
url="https://signal.org"
footer="OS: Android, iOS, macOS, Windows, Linux, Web"
footer="OS: Android, iOS, macOS, Windows, Linux"
description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
All communications are end-to-end encrypted. Signal is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
and it doesn't cost anything to use."
@ -1285,7 +1285,7 @@ layout: default
title="Mobile: Signal"
image="assets/img/tools/Signal.png"
url="https://signal.org"
footer="OS: Android, iOS, macOS, Windows, Linux, Web"
footer="OS: Android, iOS, macOS, Windows, Linux"
description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
All communications are end-to-end encrypted. Signal is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
and it doesn't cost anything to use."
@ -1454,14 +1454,14 @@ layout: default
<div class="row mb-2">
{% include card.html color="success"
title="Master Password - Cross-platform"
image="assets/img/tools/Master-Password.jpg"
url="https://masterpassword.app/"
title="Bitwarden - Cloud/Self-host"
image="assets/img/tools/bitwarden.png"
url="https://bitwarden.com/"
footer="OS: Windows, macOS, Linux, iOS, Android, Web."
description="Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored:
they are generated on-demand from your name, the site and your master password. No syncing, backups or internet access needed."
description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
%}
{% include card.html color="primary"
title="KeePass / KeePassX - Local"
image="assets/img/tools/KeePass.png"
@ -1480,6 +1480,7 @@ layout: default
description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
%}
</div>
<h3>Worth Mentioning</h3>
<ul>
@ -1488,9 +1489,7 @@ layout: default
</li>
<li>
<a href="http://www.supergenpass.com/">SuperGenPass</a> - A master password and the domain name of the Web site you are visiting is used as the “seed” for a one-way hash algorithm (base-64 MD5). The output of this algorithm is your generated password.
You remember one password (your “master password”), and SGP uses it to generate unique, complex passwords for the Web sites you visit. Your generated passwords are never stored or transmitted, so you can use SGP on as many computers as you like without
having to “sync” anything.
<a href="https://masterpassword.app">Master Password</a> - Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site and your master password. No syncing, backups or internet access needed.
</li>
<li>
@ -1570,37 +1569,43 @@ layout: default
{% include panel.html color="danger"
title="Key disclosure laws apply"
body='
1. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Antigua_and_Barbuda">Antigua and Barbuda</a> <div class="float-right"><span class="flag-icon flag-icon-ag"></span></div>
<br /> 2. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Australia">Australia</a> <div class="float-right"><span class="flag-icon flag-icon-au"></span></div>
<br /> 3. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Canada">Canada</a> <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div>
<br /> 4. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#France">France</a> <div class="float-right"><span class="flag-icon flag-icon-fr"></span></div>
<br /> 5. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#India">India</a> <div class="float-right"><span class="flag-icon flag-icon-in"></span></div>
<br /> 6. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Ireland">Ireland</a> <div class="float-right"><span class="flag-icon flag-icon-ie"></span></div>
<br /> 7. <a href="https://edri.org/norway-introduces-forced-biometric-authentication/">Norway</a> <div class="float-right"><span class="flag-icon flag-icon-no"></span></div>
<br /> 8. <a href="https://www.bloomberg.com/news/articles/2018-03-20/telegram-loses-bid-to-stop-russia-from-getting-encryption-keys">Russia</a> <div class="float-right"><span class="flag-icon flag-icon-ru"></span></div>
<br /> 9. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#South_Africa">South Africa</a> <div class="float-right"><span class="flag-icon flag-icon-za"></span></div>
<br /> 10. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_Kingdom">United Kingdom</a> <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div>
<ol class="card-ol">
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Antigua_and_Barbuda">Antigua and Barbuda</a> <div class="float-right"><span class="flag-icon flag-icon-ag"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Australia">Australia</a> <div class="float-right"><span class="flag-icon flag-icon-au"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Canada">Canada</a> <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#France">France</a> <div class="float-right"><span class="flag-icon flag-icon-fr"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#India">India</a> <div class="float-right"><span class="flag-icon flag-icon-in"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Ireland">Ireland</a> <div class="float-right"><span class="flag-icon flag-icon-ie"></span></div></li>
<li><a href="https://edri.org/norway-introduces-forced-biometric-authentication/">Norway</a> <div class="float-right"><span class="flag-icon flag-icon-no"></span></div></li>
<li><a href="https://www.bloomberg.com/news/articles/2018-03-20/telegram-loses-bid-to-stop-russia-from-getting-encryption-keys">Russia</a> <div class="float-right"><span class="flag-icon flag-icon-ru"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#South_Africa">South Africa</a> <div class="float-right"><span class="flag-icon flag-icon-za"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_Kingdom">United Kingdom</a> <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div></li>
</ol>
'
%}
{% include panel.html color="warning"
title="Key disclosure laws may apply"
body='
1. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Belgium">Belgium *</a> <div class="float-right"><span class="flag-icon flag-icon-be"></span></div>
<br /> 2. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Finland">Finland *</a> <div class="float-right"><span class="flag-icon flag-icon-fi"></span></div>
<br /> 3. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#New_Zealand">New Zealand</a> (unclear) <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div>
<br /> 4. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Sweden">Sweden</a> (proposed) <div class="float-right"><span class="flag-icon flag-icon-se"></span></div>
<br /> 5. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#The_Netherlands">The Netherlands *</a> <div class="float-right"><span class="flag-icon flag-icon-nl"></span></div>
<br /> 6. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_States">United States</a> (see related information) <div class="float-right"><span class="flag-icon flag-icon-us"></span></div>
<ol class="card-ol">
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Belgium">Belgium *</a> <div class="float-right"><span class="flag-icon flag-icon-be"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Finland">Finland *</a> <div class="float-right"><span class="flag-icon flag-icon-fi"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#New_Zealand">New Zealand</a> (unclear) <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Sweden">Sweden</a> (proposed) <div class="float-right"><span class="flag-icon flag-icon-se"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#The_Netherlands">The Netherlands *</a> <div class="float-right"><span class="flag-icon flag-icon-nl"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_States">United States</a> (see related information) <div class="float-right"><span class="flag-icon flag-icon-us"></span></div></li>
</ol>
'
%}
{% include panel.html color="success"
title="Key disclosure laws don't apply"
body='
1. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Czech_Republic">Czech Republic</a> <div class="float-right"><span class="flag-icon flag-icon-cz"></span></div>
<br /> 2. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Poland">Poland</a> <div class="float-right"><span class="flag-icon flag-icon-pl"></span></div>
<br /> 3. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Germany">Germany</a> <div class="float-right"><span class="flag-icon flag-icon-de"></span></div>
<ol class="card-ol">
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Czech_Republic">Czech Republic</a> <div class="float-right"><span class="flag-icon flag-icon-cz"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Germany">Germany</a> <div class="float-right"><span class="flag-icon flag-icon-de"></span></div></li>
<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Poland">Poland</a> <div class="float-right"><span class="flag-icon flag-icon-pl"></span></div></li>
</ol>
'
%}
@ -2256,8 +2261,8 @@ This tool uses some known methods that attempt to disable major tracking feature
<i class="fab fa-twitter"></i>
</a>
<a href="https://plus.google.com/share?url=https://www.privacytools.io" class="share-btn google-plus" title="Google+">
<i class="fab fa-google-plus-g"></i>
<a href="http://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
<i class="fab fa-mastodon"></i>
</a>
</div>
<div class="col-12 col-md-6 d-flex justify-content-between">