From 8e1cfcf3bde531dc3ea9131ec4d0e2ea5bb64598 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 09:52:11 -0500 Subject: [PATCH 01/10] Update label syntax Adds support for custom icons and better (more consistent) links --- _includes/cardv2.html | 55 ++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 031f52ab..e7eb4b52 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -41,23 +41,44 @@ {{ include.description }} {% if include.labels %} {% assign labels = include.labels | split:"|" %} - {% for label in labels %} - {% assign label_data = label | split:":" %} - {% assign color = label_data[0] %} - {% assign text = label_data[1] %} - {% assign tooltip = label_data[2] | default: false %} - {% assign help_icon = '' %} - {{text}} {{ help_icon }} - {% else %} - > {{text}} - {% endif %} - - {% endfor %} + {% for label in labels %} + {% assign label_data = label | split:"::" %} + {% assign label_attr = include.label_data | split:"==" %} + {% for attr in label_attr %} + {% assign i = forloop.index %} + {% if label_attr[i] = "color" } + {% assign color = label_attr[i+1] %} + {% elsif label_attr[i] = "link" %} + {% assign link = label_attr[i+1] %} + {% elsif label_attr[i] = "text" %} + {% assign text = label_attr[i+1] %} + {% elsif label_attr[i] = "icon" %} + {% assign icon = label_attr[i+1] %} + {% elsif label_attr[i] = "tooltip" %} + {% assign tooltip = label_attr[i+1] %} + {% endif %} + {% endfor %} + {% if link %} + {{ text }} + {% else %}> {{ text }}{% endif %} + + {% else %} + {{text}} + {% else %} + > {% if icon %}{% endif %} {{text}} + {% endif %} + + {% endif %} + {% endfor %} {% endif %}

-- 2.49.1 From 602ea000571ccbd78b562162b2fba15e67895e06 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:02:55 -0500 Subject: [PATCH 02/10] Add default color --- _includes/cardv2.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index e7eb4b52..c2d1b6bb 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -60,7 +60,7 @@ {% endfor %} {% if link %} {{ text }} @@ -68,7 +68,7 @@ {% else %} Date: Wed, 13 May 2020 10:31:33 -0500 Subject: [PATCH 03/10] Fix the operators --- _includes/cardv2.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index c2d1b6bb..adfd75e3 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -43,20 +43,20 @@ {% assign labels = include.labels | split:"|" %} {% for label in labels %} {% assign label_data = label | split:"::" %} - {% assign label_attr = include.label_data | split:"==" %} + {% assign label_attr = label_data | split:"==" %} {% for attr in label_attr %} - {% assign i = forloop.index %} - {% if label_attr[i] = "color" } - {% assign color = label_attr[i+1] %} - {% elsif label_attr[i] = "link" %} - {% assign link = label_attr[i+1] %} - {% elsif label_attr[i] = "text" %} - {% assign text = label_attr[i+1] %} - {% elsif label_attr[i] = "icon" %} - {% assign icon = label_attr[i+1] %} - {% elsif label_attr[i] = "tooltip" %} - {% assign tooltip = label_attr[i+1] %} - {% endif %} + {% assign i = forloop.index %} + {% if label_attr == "color" } + {% assign color = label_attr[i] %} + {% elsif label_attr == "link" %} + {% assign link = label_attr[i] %} + {% elsif label_attr == "text" %} + {% assign text = label_attr[i] %} + {% elsif label_attr == "icon" %} + {% assign icon = label_attr[i] %} + {% elsif label_attr == "tooltip" %} + {% assign tooltip = label_attr[i] %} + {% endif %} {% endfor %} {% if link %} Date: Wed, 13 May 2020 10:36:48 -0500 Subject: [PATCH 04/10] fix variables --- _includes/cardv2.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index adfd75e3..65c3e33b 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -46,16 +46,16 @@ {% assign label_attr = label_data | split:"==" %} {% for attr in label_attr %} {% assign i = forloop.index %} - {% if label_attr == "color" } - {% assign color = label_attr[i] %} - {% elsif label_attr == "link" %} - {% assign link = label_attr[i] %} - {% elsif label_attr == "text" %} - {% assign text = label_attr[i] %} - {% elsif label_attr == "icon" %} - {% assign icon = label_attr[i] %} - {% elsif label_attr == "tooltip" %} - {% assign tooltip = label_attr[i] %} + {% if attr == "color" } + {% assign color = attr[i] %} + {% elsif attr == "link" %} + {% assign link = attr[i] %} + {% elsif attr == "text" %} + {% assign text = attr[i] %} + {% elsif attr == "icon" %} + {% assign icon = attr[i] %} + {% elsif attr == "tooltip" %} + {% assign tooltip = attr[i] %} {% endif %} {% endfor %} {% if link %} -- 2.49.1 From 29925d98e711917b54513e60e85c37c6f3855292 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:37:02 -0500 Subject: [PATCH 05/10] update label syntax --- _includes/sections/cloud-storage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index a03c7898..143391c8 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -9,7 +9,7 @@ title="Keybase KBFS" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides 250GB of E2EE cloud storage for free. Its protocol has also been indepedently audited (PDF). Keybase allows you to share files with any Keybase user, or social media user through the use of "identity proofs". They currently do not offer additional space above your quota.' - labels="warning:Warning:This software relies on a closed-source central server." + labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://book.keybase.io/docs/files" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" @@ -27,7 +27,7 @@ title="Nextcloud - Choose your hoster" image="/assets/img/svg/3rd-party/nextcloud.svg" description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." - labels="warning:Experimental E2EE:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." + labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" -- 2.49.1 From c518f558e54d053ce6d78721944c1a5e933b89ad Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:45:08 -0500 Subject: [PATCH 06/10] Fix all my bad loops and assignments --- _includes/cardv2.html | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 65c3e33b..3b88f05a 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -43,19 +43,18 @@ {% assign labels = include.labels | split:"|" %} {% for label in labels %} {% assign label_data = label | split:"::" %} - {% assign label_attr = label_data | split:"==" %} - {% for attr in label_attr %} - {% assign i = forloop.index %} - {% if attr == "color" } - {% assign color = attr[i] %} - {% elsif attr == "link" %} - {% assign link = attr[i] %} - {% elsif attr == "text" %} - {% assign text = attr[i] %} - {% elsif attr == "icon" %} - {% assign icon = attr[i] %} - {% elsif attr == "tooltip" %} - {% assign tooltip = attr[i] %} + {% for label_attr in label_data %} + {% assign attr = label_attr | split:"==" %} + {% if attr[0] == "color" } + {% assign color = attr[1] %} + {% elsif attr[0] == "link" %} + {% assign link = attr[1] %} + {% elsif attr[0] == "text" %} + {% assign text = attr[1] %} + {% elsif attr[0] == "icon" %} + {% assign icon = attr[1] %} + {% elsif attr[0] == "tooltip" %} + {% assign tooltip = attr[1] %} {% endif %} {% endfor %} {% if link %} -- 2.49.1 From 58cb1ec15db10b03e2ed17d19192a1f9c016b882 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 10:59:56 -0500 Subject: [PATCH 07/10] Move badge code to separate file --- _includes/badge.html | 20 ++++++++++++++++++++ _includes/cardv2.html | 29 ++++++++--------------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 _includes/badge.html diff --git a/_includes/badge.html b/_includes/badge.html new file mode 100644 index 00000000..ac2a8a7e --- /dev/null +++ b/_includes/badge.html @@ -0,0 +1,20 @@ +{% if include.link %} + {{ include.text }} +{% else %}> {{ include.text }}{% endif %} + +{% else %} + {{include.text}} + {% else %} + > {% if include.icon %}{% endif %} {{include.text}} + {% endif %} + +{% endif %} diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 3b88f05a..87066b83 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -45,7 +45,7 @@ {% assign label_data = label | split:"::" %} {% for label_attr in label_data %} {% assign attr = label_attr | split:"==" %} - {% if attr[0] == "color" } + {% if attr[0] == "color" %} {% assign color = attr[1] %} {% elsif attr[0] == "link" %} {% assign link = attr[1] %} @@ -57,26 +57,13 @@ {% assign tooltip = attr[1] %} {% endif %} {% endfor %} - {% if link %} - {{ text }} - {% else %}> {{ text }}{% endif %} - - {% else %} - {{text}} - {% else %} - > {% if icon %}{% endif %} {{text}} - {% endif %} - - {% endif %} + {% include badge.html + link=link + color=color + text=text + icon=icon + tooltip=tooltip + %} {% endfor %} {% endif %}

-- 2.49.1 From 535d45d7af8fed2bbd38a28cedc95d854eb21021 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 11:05:36 -0500 Subject: [PATCH 08/10] Update cloud-storage.html --- _includes/sections/cloud-storage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index 143391c8..ec9a2081 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -9,7 +9,7 @@ title="Keybase KBFS" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides 250GB of E2EE cloud storage for free. Its protocol has also been indepedently audited (PDF). Keybase allows you to share files with any Keybase user, or social media user through the use of "identity proofs". They currently do not offer additional space above your quota.' - labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." + labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://book.keybase.io/docs/files" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" @@ -47,6 +47,6 @@

Worth Mentioning

    -
  • Cryptomator - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
    • +
  • Cryptomator - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}
  • CryptPad - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.
-- 2.49.1 From 1e5bffb8fe9c58325dfa68b9651b4d629b1fed68 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 11:08:00 -0500 Subject: [PATCH 09/10] Reset variables --- _includes/cardv2.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 87066b83..9743f3dd 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -64,6 +64,11 @@ icon=icon tooltip=tooltip %} + {% assign color = "" %} + {% assign link = "" %} + {% assign text = "" %} + {% assign icon = "" %} + {% assign tooltip = "" %} {% endfor %} {% endif %}

-- 2.49.1 From 7c819c22c79319b33ce8be82065e458f009caac9 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Wed, 13 May 2020 11:27:29 -0500 Subject: [PATCH 10/10] Update old-style badges --- _includes/cardv2.html | 10 +++++----- _includes/sections/file-sharing.html | 2 +- _includes/sections/instant-messenger.html | 10 +++++----- _includes/sections/live-operating-systems.html | 2 +- _includes/sections/mobile-operating-systems.html | 6 +++--- _includes/sections/operating-systems.html | 4 ++-- _includes/sections/router-firmware.html | 4 ++-- _includes/sections/search-engines.html | 2 +- _includes/sections/selfhosted-cloud.html | 2 +- _includes/sections/teamchat.html | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 9743f3dd..cd270fa5 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -64,11 +64,11 @@ icon=icon tooltip=tooltip %} - {% assign color = "" %} - {% assign link = "" %} - {% assign text = "" %} - {% assign icon = "" %} - {% assign tooltip = "" %} + {% assign color = nil %} + {% assign link = nil %} + {% assign text = nil %} + {% assign icon = nil %} + {% assign tooltip = nil %} {% endfor %} {% endif %}

diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html index 30d7a6fb..671b2f5d 100644 --- a/_includes/sections/file-sharing.html +++ b/_includes/sections/file-sharing.html @@ -3,7 +3,7 @@ {% include cardv2.html title="Firefox Send" image="/assets/img/svg/3rd-party/firefox_send.svg" -labels="warning:Warning: IP addresses are retained in logs for 90 days." +labels="color==warning::link==https://send.firefox.com/legal::text==Warning::tooltip==IP addresses are retained in logs for 90 days." description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security." website="https://send.firefox.com/" privacy-policy="https://send.firefox.com/legal" diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 5b73f99b..1fa5a774 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -24,7 +24,7 @@ title="Signal" image="/assets/img/svg/3rd-party/signal.svg" description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been indepedently audited (PDF)' - labels="warning:Requires phone number:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP" + labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==VoIP" website="https://signal.org/" privacy-policy="https://signal.org/legal/" forum="https://forum.privacytools.io/t/discussion-signal/664" @@ -42,7 +42,7 @@ title="Keybase" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides a hosted team chat with E2EE. Its protocol has also been indepedently audited (PDF). Keybase can help you prove you own social media accounts though the use of cryptographic signing of "identity proofs".' - labels="warning:Warning:This software relies on a closed-source central server." + labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" @@ -94,8 +94,8 @@ include cardv2.html title="Riot" image="/assets/img/svg/3rd-party/riotim.svg" - description='Riot.im is the reference client for the Matrix network. The Matrix open standard is an open-source standard for secure, decentralized, real-time communication.
' - labels="success:VoIP" + description='Riot.im is the reference client for the Matrix network. The Matrix open standard is an open-source standard for secure, decentralized, real-time communication.' + labels="text==VoIP" website="https://about.riot.im/" privacy-policy="https://riot.im/privacy" forum="https://forum.privacytools.io/t/discussion-riot-im/665/" @@ -166,7 +166,7 @@ title="Jami" image="/assets/img/svg/3rd-party/jami.svg" description="Encrypted instant messaging and video calling software. All communications are E2EE using TLS 1.3 and never stored elsewhere than on user's devices, even when TURN servers are used." - labels="warning:Warning:This software is partially centralized but can be self-hosted.|success:VoIP" + labels="color==warning::link==https://git.jami.net/savoirfairelinux/ring-project/issues/765::text==Warning::tooltip==This software is partially centralized but can be self-hosted.|text==VoIP" website="https://jami.net/" privacy-policy="https://jami.net/privacy-policy/" forum="https://forum.privacytools.io/t/discussion-jami/2116" diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index f17db2f5..f566b552 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -5,7 +5,7 @@ title="Tails" image="/assets/img/svg/3rd-party/tails.svg" description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.' badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://tails.boum.org/" git="https://git-tails.immerda.ch/tails/" %} diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/mobile-operating-systems.html index 0db145ab..f17d7ab8 100644 --- a/_includes/sections/mobile-operating-systems.html +++ b/_includes/sections/mobile-operating-systems.html @@ -10,7 +10,7 @@ image="/assets/img/svg/3rd-party/grapheneos.svg" image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg" description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.' badges="info:AOSP" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://grapheneos.org/" github="https://github.com/GrapheneOS/" %} @@ -20,7 +20,7 @@ title="LineageOS" image="/assets/img/svg/3rd-party/lineageos.svg" description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.' badges="info:AOSP" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.lineageos.org/" privacy-policy="https://www.lineageos.org/legal/" github="https://github.com/LineageOS" @@ -31,7 +31,7 @@ title="Ubuntu Touch" image="/assets/img/svg/3rd-party/ubuntu.svg" description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://ubuntu-touch.io/" privacy-policy="https://ubports.com/privacy" github="https://github.com/ubports" diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 1fdb8c44..487a432f 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -9,7 +9,7 @@ title="Qubes OS" image="/assets/img/svg/3rd-party/qubes_os.svg" description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' badges="info:Xen" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.qubes-os.org/" privacy-policy="https://www.qubes-os.org/privacy/" github="https://github.com/QubesOS" @@ -21,7 +21,7 @@ title="Fedora Workstation" image="/assets/img/svg/3rd-party/fedora.svg" description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.' badges="info:GNU/Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://getfedora.org/" privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy" git="https://src.fedoraproject.org/" diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index b6988966..cb19f6d5 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -6,7 +6,7 @@ image="/assets/img/svg/3rd-party/openwrt.svg" image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg" description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." badges="info:Linux" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://openwrt.org/" git="https://git.openwrt.org/" %} @@ -17,7 +17,7 @@ image="/assets/img/svg/3rd-party/pfsense.svg" image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg" 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." badges="info:BSD" -labels="warning:contrib:This software may depend on or recommend non-free software." +labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.pfsense.org/" privacy-policy="https://www.pfsense.org/privacy.html" github="https://github.com/pfsense/" diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index ed90e59e..44d720ff 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -42,7 +42,7 @@ github="https://github.com/Qwant/" title="Startpage.com" image="/assets/img/svg/3rd-party/startpage.svg" description='Startpage.com is a search engine that provides Google search results with complete privacy protection. Startpage BV is a Netherlands-based company that has been dedicated to privacy-respecting search since 2006.' -labels="warning:Warning:Startpage.com was recently acquired by United States-based System1." +labels="color==warning::link==https://support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1::text==Warning::tooltip==Startpage.com was recently acquired by United States-based System1." website="https://www.startpage.com/" privacy-policy="https://www.startpage.com/en/privacy-policy/" forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284" diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html index 15b6aff9..a8e02543 100644 --- a/_includes/sections/selfhosted-cloud.html +++ b/_includes/sections/selfhosted-cloud.html @@ -8,7 +8,7 @@ title="Nextcloud" image="/assets/img/svg/3rd-party/nextcloud.svg" description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." - labels="warning:Experimental E2EE:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." + labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index d96b280e..c0b31e45 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -13,7 +13,7 @@ title="Riot" image="/assets/img/svg/3rd-party/riotim.svg" description='Riot.im is the reference client for the Matrix network. The Matrix open standard is an open-source standard for secure, decentralized, real-time communication.
' - labels="success:VoIP" + labels="text==VoIP" website="https://about.riot.im/" privacy-policy="https://riot.im/privacy" forum="https://forum.privacytools.io/t/discussion-riot-im/665/" @@ -32,7 +32,7 @@ title="Rocket.chat" image="/assets/img/svg/3rd-party/rocketchat.svg" description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE." - labels="warning:Experimental E2EE: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. Federation was also added afterwards, potentially causing room for mistakes.|success:VoIP" + labels="color==warning::link==https://rocket.chat/docs/user-guides/end-to-end-encryption/::text==Experimental E2EE::tooltip==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. Federation was also added afterwards, potentially causing room for mistakes.|text==VoIP" website="https://rocket.chat/" privacy-policy="https://rocket.chat/privacy" forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223" @@ -50,7 +50,7 @@ title="Keybase" image="/assets/img/svg/3rd-party/keybase.svg" description='Keybase provides a hosted team chat with E2EE. Its protocol has also been indepedently audited (PDF). Keybase can help you prove you own social media accounts through the use of cryptographic signing of "identity proofs".' - labels="warning:Warning:This software relies on a closed-source central server." + labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" -- 2.49.1