Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
RTC: List Riot as recommended & imrpove badges (#1392)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaharagon authored and Mikaela committed Oct 10, 2019
1 parent 01c040f commit 0ed008d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
4 changes: 2 additions & 2 deletions _includes/sections/instant-messenger.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ <h3>Complete Comparison</h3>
<h3>Worth Mentioning</h3>

<ul>
<li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
<li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.</li>
<li><a href="https://about.riot.im/">Riot</a> - An open-source, federated messenger that utilizes the Matrix protocol. This application is primarily recommended as a large group/team chat solution. While Riot has the ability to perform 1-on-1 communications we believe there are better solutions for direct communications.</li>
<li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
<li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
<ul>
Expand Down Expand Up @@ -80,4 +81,3 @@ <h3>Related Information</h3>
<li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
</ul>
</ul>

21 changes: 19 additions & 2 deletions _includes/sections/teamchat.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,30 @@ <h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link ancho
<strong>If your project or organization currently uses a platform like <a href="https://tosdr.org/#discord">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="Riot.im (Matrix)"
image="/assets/img/tools/Riot.png"
description="Riot.im is a federated free-software messaging application based on the <a href\"https://matrix.org/\">Matrix</a> protocol, a recent open protocol for real-time communication offering optional E2E encryption. It also has bridging functionality, allowing you to connect to other chat protocols such as IRC or Telegram."
labels="warning:<a href=//github.com/vector-im/riot-web/issues/6779>Experimental E2EE</a>:The end-to-end encryption is currently in beta and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data."
website="https://about.riot.im/"
forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
github="https://github.com/vector-im/riot-web/"
windows="https://riot.im/download/desktop/"
mac="https://riot.im/download/desktop/"
linux="https://riot.im/download/desktop/"
fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha"
googleplay="https://play.google.com/store/apps/details?id=im.vector.app"
ios="https://itunes.apple.com/us/app/vector.im/id1083446067"
web="https://riot.im/app/"
%}

{%
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."
labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental</a>:Regarding E2EE their documentation states '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."
labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental E2EE</a>:Regarding E2EE their documentation states '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."
website="https://rocket.chat/"
forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
github="https://github.com/rocketchat/"
Expand Down Expand Up @@ -39,7 +57,6 @@ <h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link ancho
ios="https://keybase.io/_/download/keybase-for-ios"
firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/"
chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
web="https://keybase.io/"
%}


Expand Down
Binary file added assets/img/tools/Riot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0ed008d

Please sign in to comment.