Merge branch 'master' into Source_Code
This commit is contained in:
		| @@ -66,126 +66,104 @@ | ||||
| <!-- navigation starts --> | ||||
|  | ||||
| <nav id="navbar" class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"> | ||||
| <div class="container"> | ||||
|   <div class="container"> | ||||
|     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> | ||||
|         <span class="navbar-toggler-icon"></span> | ||||
|       <span class="navbar-toggler-icon"></span> | ||||
|     </button> | ||||
|  | ||||
|     <div class="collapse navbar-collapse" id="navbarSupportedContent"> | ||||
|         <ul class="navbar-nav mr-auto"> | ||||
|       <ul class="navbar-nav mr-auto"> | ||||
|         {% assign prefix = "" %} | ||||
|         {% if page.active_page %} | ||||
|             {% assign prefix = "index.html" %} | ||||
|         {% assign prefix = "index.html" %} | ||||
|         {% endif %} | ||||
|         <li class="nav-item"> | ||||
|             <a class="nav-link" href="{{prefix}}#top"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a> | ||||
|           <a class="nav-link" href="{{prefix}}#top"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a> | ||||
|         </li> | ||||
|         <li class="nav-item dropdown"> | ||||
|             <a class="nav-link dropdown-toggle" href="#" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|           <a class="nav-link dropdown-toggle" href="#" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|             Provider | ||||
|             </a> | ||||
|             <div class="dropdown-menu" aria-labelledby="providerDropdown"> | ||||
|             <a class="dropdown-item" href="{{prefix}}#ukusa">Avoid all US and UK based services</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#vpn">Virtual Private Network (VPN)</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#email">Privacy Email</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#wc">Warrant Canaries</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#cloud">Encrypted Cloud Storage Services</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#social">Decentralized Social Networks</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#dns">Domain Name System (DNS)</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#search">Privacy Respecting Search Engines</a> | ||||
|             </div> | ||||
|           </a> | ||||
|           <div class="dropdown-menu" aria-labelledby="providerDropdown"> | ||||
|             <a class="dropdown-item" href="{{prefix}}#ukusa"><i class="fab fa-creative-commons-nc"></i> Avoid all US and UK based services</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#vpn"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#email"><i class="fas fa-mail-bulk"></i> Privacy Email</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#wc"><i class="fa fa-exclamation-circle"></i> Warrant Canaries</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#cloud"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#social"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#dns"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#search"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#host"><i class="fas fa-database"></i> Secure Hosting Providers</a> | ||||
|           </div> | ||||
|         </li> | ||||
|         <li class="nav-item dropdown"> | ||||
|             <a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|                 Browser | ||||
|             </a> | ||||
|             <div class="dropdown-menu" aria-labelledby="browserDropdown"> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#browser">Recommendation</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#fingerprint">Fingerprint</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#webrtc">WebRTC IP Leak</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#addons">Firefox Privacy Add-ons</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#about_config">Privacy Related Tweaks</a> | ||||
|             </div> | ||||
|           <a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|             Browser | ||||
|           </a> | ||||
|           <div class="dropdown-menu" aria-labelledby="browserDropdown"> | ||||
|             <a class="dropdown-item" href="{{prefix}}#browser"><i class="fas fa-check"></i> Recommendation</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#fingerprint"><i class="fas fa-fingerprint"></i> Fingerprint</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#webrtc"><i class="far fa-eye"></i> WebRTC IP Leak</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#addons"><i class="far fa-list-alt"></i> Firefox Privacy Add-ons</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#about_config"><i class="fas fa-wrench"></i> Privacy Related Tweaks</a> | ||||
|           </div> | ||||
|         </li> | ||||
|         <li class="nav-item dropdown"> | ||||
|             <a class="nav-link dropdown-toggle" href="#" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|                 Software | ||||
|             </a> | ||||
|             <div class="dropdown-menu" aria-labelledby="softwareDropdown"> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#clients">Email Clients</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#messaging">Email Alternatives</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#search">Search Engines</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#im">Instant Messenger</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#voip">Video & Voice Messenger</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#filesharing">File Sharing</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#cloud">Encrypted Cloud Storage</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#mycloud">Self-Hosted Cloud Server</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#sync">Secure File Sync</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#pw">Password Manager</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#calendar_contacts">Calendar and Contacts Sync</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#encrypt">File Encryption</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#darknets">Self-contained Networks</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#social">Social Networks</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#dns">DNS</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#notebook">Digital Notebook</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#paste">Paste Services</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#productivity">Productivity Tools</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#win10">Don't use Windows 10</a> | ||||
|                 <a class="dropdown-item" href="https://www.privacytools.io/source_code.md/">Source Code</a> | ||||
|             </div> | ||||
|           <a class="nav-link dropdown-toggle" href="#" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|             Software | ||||
|           </a> | ||||
|           <div class="dropdown-menu" aria-labelledby="softwareDropdown"> | ||||
|             <a class="dropdown-item" href="{{prefix}}#clients"><i class="fas fa-envelope"></i> Email Clients</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#messaging"><i class="fas fa-random"></i> Email Alternatives</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#im"><i class="fab fa-telegram-plane"></i> Instant Messenger</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#voip"><i class="fas fa-phone"></i> Video & Voice Messenger</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#filesharing"><i class="fas fa-file-export"></i> File Sharing</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#mycloud"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#sync"><i class="fas fa-copy"></i> Secure File Sync</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#pw"><i class="fas fa-user-lock"></i> Password Manager</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#calendar_contacts"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#encrypt"><i class="fas fa-lock"></i> File Encryption</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#darknets"><i class="fas fa-user-secret"></i> Self-contained Networks</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#notebook"><i class="far fa-sticky-note"></i> Digital Notebook</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#paste"><i class="fas fa-paste"></i> Paste Services</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#productivity"><i class="fas fa-briefcase"></i> Productivity Tools</a> | ||||
|             <a class="dropdown-item" href="/source_code">Source Code</a> | ||||
|           </div> | ||||
|         </li> | ||||
|         <li class="nav-item dropdown"> | ||||
|             <a class="nav-link dropdown-toggle" href="#" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|                 OS | ||||
|             </a> | ||||
|             <div class="dropdown-menu" aria-labelledby="osDropdown"> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#os">PC OS</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#live_os">Live CD OS</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#mobile_os">Mobile OS</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#aaddons">Android Privacy Add-ons</a> | ||||
|                 <a class="dropdown-item" href="{{prefix}}#firmware">Router Firmware</a> | ||||
|             </div> | ||||
|           <a class="nav-link dropdown-toggle" href="#" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|             OS | ||||
|           </a> | ||||
|           <div class="dropdown-menu" aria-labelledby="osDropdown"> | ||||
|             <a class="dropdown-item" href="{{prefix}}#os"><i class="fas fa-th-large"></i> PC OS</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#live_os"><i class="fas fa-compact-disc"></i> Live CD OS</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#mobile_os"><i class="fas fa-mobile-alt"></i> Mobile OS</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#aaddons"><i class="fas fa-th"></i> Android Privacy Add-ons</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#firmware"><i class="fas fa-signal"></i> Router Firmware</a> | ||||
|             <a class="dropdown-item" href="{{prefix}}#win10"><i class="far fa-thumbs-down"></i> Don't use Windows 10</a> | ||||
|           </div> | ||||
|         </li> | ||||
|         <li class="nav-item"> | ||||
|             <a class="nav-link" href="#participate">Participate</a> | ||||
|           <a class="nav-link" href="#participate">Participate</a> | ||||
|         </li> | ||||
|         <li class="nav-item dropdown"> | ||||
|             <a class="nav-link dropdown-toggle" href="#" id="shareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||||
|                 Share | ||||
|             </a> | ||||
|             <div class="dropdown-menu" aria-labelledby="shareDropdown"> | ||||
|                 <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&url=https://www.privacytools.io/&via=privacytoolsIO">Twitter</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> | ||||
|                 <a class="dropdown-item" href="http://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io">Diaspora*</a> | ||||
|             </div> | ||||
|         </li> | ||||
|         <li class="nav-item"> | ||||
|             <a class="nav-link" href="https://twitter.com/privacytoolsIO">Twitter</a> | ||||
|         </li> | ||||
|         </ul> | ||||
|         <ul class="navbar-nav"> | ||||
|       </ul> | ||||
|       <ul class="navbar-nav"> | ||||
|         {% if page.active_page == "donate" %} | ||||
|             <li class="nav-item active"> | ||||
|                 <a class="nav-link" href="#">Donate <i class="fas fa-heart text-danger"></i></a> | ||||
|             </li> | ||||
|         <li class="nav-item active"> | ||||
|           <a class="nav-link" href="#">Donate <i class="fas fa-heart text-danger"></i></a> | ||||
|         </li> | ||||
|         {% else %} | ||||
|             <li class="nav-item"> | ||||
|                 <a class="nav-link" href="donate.html">Donate <i class="fas fa-heart text-danger"></i></a> | ||||
|             </li> | ||||
|         <li class="nav-item"> | ||||
|           <a class="nav-link" href="donate.html">Donate <i class="fas fa-heart text-danger"></i></a> | ||||
|         </li> | ||||
|         {% endif %} | ||||
|         </ul> | ||||
|       </ul> | ||||
|     </div> | ||||
| </div> | ||||
|   </div> | ||||
| </nav> | ||||
| <!-- navigation ends here --> | ||||
|  | ||||
| <div class="py-4"> | ||||
| <h1 id="top"></h1> | ||||
| <div id="top" class="py-4"> | ||||
| <div class="mb-5"></div> | ||||
| {{ content }} | ||||
| </div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Samuel Shifterovich
					Samuel Shifterovich