From bdda5e9419ad720b1d89882826ecdee6b0ef93b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=A0?= Date: Wed, 13 May 2020 11:28:55 +0000 Subject: [PATCH 1/2] Add warning to Keybase products --- _includes/sections/cloud-storage.html | 38 +++++++++++------------ _includes/sections/instant-messenger.html | 2 +- _includes/sections/teamchat.html | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index a03c7898..a53cf3c2 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -4,25 +4,6 @@ If you are currently using Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should pick an alternative here. -{% - include cardv2.html - 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." - website="https://book.keybase.io/docs/files" - privacy-policy="https://keybase.io/docs/privacypolicy" - forum="https://forum.privacytools.io/t/discussion-keybase/1224" - tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/" - github="https://github.com/keybase/client/tree/master/go/kbfs" - windows="https://keybase.io/docs/the_app/install_windows" - mac="https://keybase.io/docs/the_app/install_macos" - linux="https://keybase.io/docs/the_app/install_linux" - freebsd="https://www.freshports.org/security/keybase/" - googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage" - ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770" -%} - {% include cardv2.html title="Nextcloud - Choose your hoster" image="/assets/img/svg/3rd-party/nextcloud.svg" @@ -43,6 +24,25 @@ github="https://github.com/nextcloud" %} +{% + include cardv2.html + 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.|danger:Important warning:This software has recently been acquired by Zoom. Its future is currently not known." + website="https://book.keybase.io/docs/files" + privacy-policy="https://keybase.io/docs/privacypolicy" + forum="https://forum.privacytools.io/t/discussion-keybase/1224" + tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/" + github="https://github.com/keybase/client/tree/master/go/kbfs" + windows="https://keybase.io/docs/the_app/install_windows" + mac="https://keybase.io/docs/the_app/install_macos" + linux="https://keybase.io/docs/the_app/install_linux" + freebsd="https://www.freshports.org/security/keybase/" + googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage" + ios="https://apps.apple.com/app/keybase-crypto-for-everyone/id1044461770" +%} +

Worth Mentioning

diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 5b73f99b..7ee35c3a 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -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="warning:Warning:This software relies on a closed-source central server.|danger:Important warning:This software has recently been acquired by Zoom. Its future is currently not known." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index c7e935f6..b3f72159 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -51,7 +51,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="warning:Warning:This software relies on a closed-source central server.|danger:Important warning:This software has recently been acquired by Zoom. Its future is currently not known." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" -- 2.47.2 From 6e4a59072dbd3946abde10e1f7adfb9c5d4adc00 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Wed, 13 May 2020 12:54:53 +0000 Subject: [PATCH 2/2] Don't use danger warnings, remove alarmist tone --- _includes/sections/cloud-storage.html | 2 +- _includes/sections/instant-messenger.html | 2 +- _includes/sections/teamchat.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index a53cf3c2..cc78f308 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -29,7 +29,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.|danger:Important warning:This software has recently been acquired by Zoom. Its future is currently not known." + labels="warning:Warning:This software relies on a closed-source central server.|warning:Ownership change:Keybase has recently been acquired by Zoom." website="https://book.keybase.io/docs/files" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 7ee35c3a..b590d2e2 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -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.|danger:Important warning:This software has recently been acquired by Zoom. Its future is currently not known." + labels="warning:Warning:This software relies on a closed-source central server.|warning:Ownership change:Keybase has recently been acquired by Zoom." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index b3f72159..041d0ba3 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -51,7 +51,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.|danger:Important warning:This software has recently been acquired by Zoom. Its future is currently not known." + labels="warning:Warning:This software relies on a closed-source central server.|warning:Ownership change:Keybase has recently been acquired by Zoom." website="https://keybase.io/" privacy-policy="https://keybase.io/docs/privacypolicy" forum="https://forum.privacytools.io/t/discussion-keybase/1224" -- 2.47.2