From 500db30fdbf2e333a58191d2d8f40c54b05f4a9a Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 26 Jul 2019 00:08:17 +0300 Subject: [PATCH 1/6] instant-messenger.html: make XMPP and OMEMO links (#1052) --- _includes/sections/instant-messenger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 23a5caf2..c9197567 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -65,7 +65,7 @@ web="" -
  • Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
    • +
  • Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
  • Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
    • diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html index bf67ae76..219f867a 100644 --- a/_includes/sections/notebooks.html +++ b/_includes/sections/notebooks.html @@ -9,7 +9,7 @@ {% include card.html color="success" title="Joplin" image="/assets/img/tools/Joplin.png" - url="https://joplin.cozic.net/" + url="https://joplinapp.org/" footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)." description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes." %} @@ -42,6 +42,6 @@ diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index a3ecc5d1..40395a7d 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -14,7 +14,7 @@ title="pfSense" labels="warning:contrib:This software may depend on or recommend non-free software." image="/assets/img/tools/pfSense.png" - url="https://pfsense.org/" + url="https://www.pfsense.org/" description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." %} -- 2.49.0 From ee58fc8beb95d56455cc596711c1ea2c9fc89e66 Mon Sep 17 00:00:00 2001 From: Jonah Date: Mon, 29 Jul 2019 12:00:39 -0500 Subject: [PATCH 3/6] Remove Matrix Identity Server Related Issues: #1047, #1049 --- .well-known/matrix/client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.well-known/matrix/client b/.well-known/matrix/client index 20a0718d..ee6d0a59 100644 --- a/.well-known/matrix/client +++ b/.well-known/matrix/client @@ -3,6 +3,6 @@ "base_url": "https://chat.privacytools.io" }, "m.identity_server": { - "base_url": "https://vector.im" + "base_url": "https://chat.privacytools.io" } } -- 2.49.0 From 1c56eaf7de22a3ab2db2e2b46644adc51233fc74 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 25 Jul 2019 01:46:34 +0300 Subject: [PATCH 4/6] instant-messenger: change Riot privacy concerns link to #1049 --- _includes/sections/instant-messenger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 23a5caf2..51201692 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -24,7 +24,7 @@ linux="" {% include cardv2.html title="Riot.im" image="/assets/img/tools/Riot.png" -description="Riot.im is a decentralized free-software chatting application based on the Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. Experimental Privacy concerns" +description="Riot.im is a decentralized free-software chatting application based on the Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. Experimental Privacy concerns" website="https://riot.im/" forum="https://forum.privacytools.io/t/discussion-riot-im/665" github="https://github.com/vector-im" -- 2.49.0 From 7b68dc3832b49891e92e9b59aaa9fcfd80e22fdf Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 30 Jul 2019 15:19:11 +0300 Subject: [PATCH 5/6] instant-messenger.html: fix Riot privacy concern text --- _includes/sections/instant-messenger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 51201692..2818dca0 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -24,7 +24,7 @@ linux="" {% include cardv2.html title="Riot.im" image="/assets/img/tools/Riot.png" -description="Riot.im is a decentralized free-software chatting application based on the Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. Experimental Privacy concerns" +description="Riot.im is a decentralized free-software chatting application based on the Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. Experimental Privacy concerns" website="https://riot.im/" forum="https://forum.privacytools.io/t/discussion-riot-im/665" github="https://github.com/vector-im" -- 2.49.0 From eb0221b55492b7bb8c6a51244d6faf03739cee3c Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 2 Aug 2019 08:46:03 +0000 Subject: [PATCH 6/6] Update _includes/sections/instant-messenger.html Co-Authored-By: Jonah Aragon --- _includes/sections/instant-messenger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 2818dca0..be112285 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -24,7 +24,7 @@ linux="" {% include cardv2.html title="Riot.im" image="/assets/img/tools/Riot.png" -description="Riot.im is a decentralized free-software chatting application based on the Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. Experimental Privacy concerns" +description="Riot.im is a decentralized free-software chatting application based on the Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. Experimental Privacy concerns" website="https://riot.im/" forum="https://forum.privacytools.io/t/discussion-riot-im/665" github="https://github.com/vector-im" -- 2.49.0