voice-video-messenger: remove duplicates with instant-messenger

also move Tox and Jami to Instant Messengers, Change Jitsi to Jitsi Meet
This commit is contained in:
Mikaela Suomalainen 2019-08-12 12:32:30 +03:00
parent a7e77bf42f
commit 8f05a68761
No known key found for this signature in database
GPG Key ID: 0C207F07B2F32B67
2 changed files with 4 additions and 37 deletions

View File

@ -60,6 +60,8 @@ web=""
<li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
<li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
<li><a href="https://ricochet.im/">Ricochet</a> - <span class="badge badge-danger" data-toggle="tooltip" title="This software is safe if you manually keep Tor up to date."><a href="#ricochetTor" class="text-white">Danger</a></span> <span class="badge badge-warning" data-toggle="tooltip" title="This software is considered safe but experimental and the client has not been updated since 2016."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.</li>
<li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. </li>
<li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
</ul>

View File

@ -4,38 +4,6 @@
<strong>If you are currently using a Video & Voice Messenger like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong>
</div>
{% include cardv2.html
title="Mobile: Signal"
image="/assets/img/tools/Signal.png"
website="https://signal.org"
description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
All communications are end-to-end encrypted. Signal is free and open source."
forum="https://forum.privacytools.io/t/discussion-signal/664"
github="https://github.com/signalapp"
android=""
ios=""
mac=""
windows=""
linux=""
footer="OS: Android, iOS, macOS, Windows, Linux"
%}
{% include cardv2.html
title="Wire"
image="/assets/img/tools/wire.png"
website="https://wire.com/download/"
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. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The company keeps a list of all the users you contact until you delete your account.\">Caution <i class=\"far fa-question-circle\"></i></span>"
forum="https://forum.privacytools.io/t/discussion-wire/750"
github="https://github.com/wireapp"
android=""
ios=""
mac=""
windows=""
linux=""
web=""
%}
{% include cardv2.html
title="Linphone"
image="/assets/img/tools/Linphone.png"
@ -57,14 +25,11 @@ web=""
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://jitsi.org/">Jitsi</a> - Jitsi is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.</li>
<li> <a href="https://tox.chat/">Tox</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. </li>
<li><a href="https://jami.net/">Jami (formerly Ring/SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
<li><a href="https://jitsi.org/">Jitsi Meet</a> - Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.</li>
</ul>
<h3>Related Information</h3>
<ul>
<li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
<li><a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">Secure Messaging App Wire Stores Everyone You've Ever Contacted in Plain Text | Motherboard</a></li>
<!-- TODO -->
</ul>