privacyguides/privacytools.io
Archived
1
0
Fork 0
Code Issues 304 Pull Requests 47 Activity

Merge branch 'master' into i18n

Browse Source
This commit is contained in:
Jonah
2019-08-11 22:39:01 -05:00
parent eaae0d62ac a7e77bf42f
commit 35fed7978b
10 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_includes/nav.html
View File

@ -49,14 +49,12 @@
<a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> {% t software.email_clients %}</a>
<a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> {% t software.file_encryption %}</a>
<a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> {% t software.file_sharing %}</a>
<a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> {% t software.im %}</a>
<a class="dropdown-item" href="/software/teamchat/"><i class="fas fa-users fa-fw"></i> {% t software.team_chat %}</a>
<a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> {% t software.password_managers %}</a>
<a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> {% t software.productivity %}</a>
<a class="dropdown-item" href="/software/real-time-communication/"><i class="fas fa-comments fa-fw"></i> {% t software.rtc %}</a>
<a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> {% t software.file_sync %}</a>
<a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> {% t software.networks %}</a>
<a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> {% t software.cloud %}</a>
<a class="dropdown-item" href="/software/voip/"><i class="fas fa-phone fa-fw"></i> {% t software.voip %}</a>
</div>
</li>
<li class="nav-item dropdown">

6
_includes/sections/teamchat.html
View File

@ -1,7 +1,7 @@
<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>
<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team Chat Applications</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>
<strong>If your project or organization 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
@ -37,5 +37,5 @@ 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>
<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="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested<i class="far fa-question-circle"></i></span></li>
</ul>