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

Commit

Permalink
Revert "[WIP] Utilize Riot Instead of Wire (#562)" (#597)
Browse files Browse the repository at this point in the history
This reverts commit 7955244.
  • Loading branch information
Samuel Shifterovich authored Nov 17, 2018
1 parent 7955244 commit ab4fedf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Binary file removed img/tools/riot.jpg
Binary file not shown.
16 changes: 8 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1235,12 +1235,14 @@ <h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i>
%}

{% include card.html color="primary"
title="Riot"
image="img/tools/riot.jpg"
url="https://riot.im"
title="Wire"
image="assets/img/tools/wire.png"
url="https://get.wire.com"
footer="OS: Android, iOS, macOS, Windows, Linux, Web"
description="Riot.im is a client for the martix protocole. A distributed chat client that offers E2E. A successor of IRC and XMPP"
<b>Caution:</b> E2E is off by Default https://github.com/vector-im/riot-web/issues/6779#issue-325289121"
description="Wire is an app developed by Wire Swiss GmbH.
The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code.
The development team is backed by Iconical and they will monetize in the future with premium features/services.<br>
<b>Caution:</b> The company keeps a list of all the users you contact until you delete your account."
%}

{% include card.html color="warning"
Expand All @@ -1261,9 +1263,7 @@ <h3>Worth Mentioning</h3>
<li><a href="http://kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
<li><a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations">Conversations</a> - An open source Jabber/XMPP client for Android 4.4+ smartphones. Supports end-to-end encryption with either OMEMO or openPGP. There is also <a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations.legacy">Conversations Legacy</a> which still supports OTR.</li>
<li><a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging#Client_support">List of OTR Clients - Wikipedia</a></li>
<li><a href="https://matrix.org/">Wire</a> Wire is an app developed by Wire Swiss GmbH.
The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code.
The development team is backed by Iconical and they will monetize in the future with premium features/services. ">https://wire.com/</a>Caution: The company keeps a list of all the users you contact until you delete your account.</li>
<li><a href="https://matrix.org/">The Matrix protocol</a> and it's various clients such as <a href="https://about.riot.im/">Riot.im</a>. A successor of XMPP.</li>
</ul>

<h3>Related Information</h3>
Expand Down

0 comments on commit ab4fedf

Please sign in to comment.