Revert "[WIP] Utilize Riot Instead of Wire (#562)" (#597)

This reverts commit 79552447aa.
This commit is contained in:
Samuel Shifterovich 2018-11-17 15:51:19 +01:00 committed by GitHub
parent 79552447aa
commit ab4fedfb95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@ -1235,12 +1235,14 @@ layout: default
%} %}
{% include card.html color="primary" {% include card.html color="primary"
title="Riot" title="Wire"
image="img/tools/riot.jpg" image="assets/img/tools/wire.png"
url="https://riot.im" url="https://get.wire.com"
footer="OS: Android, iOS, macOS, Windows, Linux, Web" 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" description="Wire is an app developed by Wire Swiss GmbH.
<b>Caution:</b> E2E is off by Default https://github.com/vector-im/riot-web/issues/6779#issue-325289121" 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" {% include card.html color="warning"
@ -1261,9 +1263,7 @@ layout: default
<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="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://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://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. <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>
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>
</ul> </ul>
<h3>Related Information</h3> <h3>Related Information</h3>