Merge remote-tracking branch 'origin/master' into remove-xprivacylua

_includes/nav.html

@@ -16,14 +16,13 @@
           <div class="dropdown-menu" aria-labelledby="providerDropdown">
             <a class="dropdown-item" href="/providers/#ukusa"><i class="fab fa-creative-commons-nc fa-fw"></i> Avoid US & UK services</a>
             <a class="dropdown-item" href="/providers/cloud-storage/"><i class="fas fa-cloud fa-fw"></i> Cloud Storage</a>
-            <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
-            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> Social News Aggregators</a>
             <a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks fa-fw"></i> DNS</a>
             <a class="dropdown-item" href="/providers/email/"><i class="fas fa-mail-bulk fa-fw"></i> Email</a>
             <a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</a>
             <a class="dropdown-item" href="/providers/paste/"><i class="fas fa-paste fa-fw"></i> Pastebins</a>
             <a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin fa-fw"></i> Search Engines</a>
             <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> Social News Aggregators</a>
             <a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
           </div>
         </li>
@@ -51,6 +50,7 @@
             <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
             <a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
+            <a class="dropdown-item" href="/software/teamchat/"><i class="fas fa-users fa-fw"></i> Team chat</a>
             <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
             <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
             <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>

_includes/sections/android-addons.html

@@ -7,7 +7,7 @@
 <div class="container-fluid">
 
   <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
     </div>
     <div class="col">
@@ -17,7 +17,7 @@
   </div>
 
   <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
     </div>
     <div class="col">
@@ -27,7 +27,7 @@
   </div>
 
   <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/Orbot.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
     </div>
     <div class="col">

_includes/sections/paste-services.html

@@ -7,4 +7,14 @@ description="PrivateBin is a minimalist, open source online pastebin where the s
 website="https://bin.privacytools.io/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
 github="https://github.com/PrivateBin/PrivateBin"
-%}
+%}
+
+
+{% include cardv2.html
+title="CryptPad"
+image="/assets/img/provider/CryptPad.png"
+description="CryptPad is an open source, zero knowledge, realtime collaborative editor. Data is encrypted/decrypted in the browser using 256bit AES."
+website="https://cryptpad.fr/pad/"
+forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
+github="https://github.com/xwiki-labs/cryptpad"
+%}

_includes/sections/teamchat.html

@@ -0,0 +1,41 @@
+<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team chat applications where everything is end-to-end encrypted or under the control of your team administrator</h1>
+
+<div class="alert alert-warning" role="alert">
+        <strong>If your project currently uses a team chat like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+title="Rocket.chat"
+image="/assets/img/tools/rocket.chat.png"
+description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\"><span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The documentation says this of E2EE: 'Note: This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes.'\">Experimental <i class=\"far fa-question-circle\"></i></a></span>"
+website="https://rocket.chat/"
+forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
+github="https://github.com/rocketchat/"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+%}
+
+{% include cardv2.html
+title="Keybase"
+image="/assets/img/tools/keybase.png"
+description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. <span class="badge badge-warning" data-toggle="tooltip" title="The server side of Keybase runs on proprietary code and is centralized">experimental <i class="far fa-question-circle"></i> (<a href="https://github.com/keybase/client/issues/6374">GitHub issue</a>)</span>'
+website="https://keybase.io/"
+forum="https://forum.privacytools.io/t/discussion-keybase/1224"
+github="https://github.com/Keybase"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="The Privacytools.io team has no experience with Wire Pro, while we can recommend the free version.">Untested<i class="far fa-question-circle"></i></span></li>
+</ul>

assets/css/style.scss

@@ -182,4 +182,4 @@ footer {
   i {
     margin-right: 1rem;
   }
-}
+}

pages/software/teamchat.html

@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/teamchat/
+title: "Team chat"
+description: "Discover secure and private ways to communicate with your team online without letting any third parties read your messages."
+---
+
+{% include sections/teamchat.html %}

source_code.md

@@ -136,6 +136,12 @@ Backend: closed-source
 
  Ricochet: https://github.com/ricochet-im/ricochet
 
+## Team chat
+
+ Rocket.chat: https://github.com/rocketchat/
+ 
+ Keybase: https://github.com/Keybase
+
 ## Encrypted Video & Voice Messenger
  Signal: https://github.com/signalapp
 
@@ -328,6 +334,8 @@ PowerDNS: https://github.com/PowerDNS/pdns
  ZeroBin: https://github.com/sebsauvage/ZeroBin
 
  Ghostbin: https://github.com/kilgarth/ghostbin
+ 
+ CryptPad: https://github.com/xwiki-labs/cryptpad
 
   Worth Mentioning: