From eb814cc9672276476a0f129928bbcc38f19b6ed7 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 16 Jul 2020 17:28:31 +0300 Subject: [PATCH 1/5] operating-systems: mention other Fedora Flavours and Ubuntu Spins (#1988) * operating-systems: mention other Fedora Flavours and Ubuntu Spins * Remove slash, merge with existing sentence Co-authored-by: Daniel Gray --- _includes/sections/operating-systems.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 0882ebee..953cabe2 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -7,7 +7,7 @@ {% include cardv2.html 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.' + 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. Fedora by default comes with the GNOME desktop environment, other desktop environments are also available.' badges="info:Linux" website="https://getfedora.org/" privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy" @@ -17,7 +17,7 @@ {% include cardv2.html title="Ubuntu" image="/assets/img/svg/3rd-party/ubuntu.svg" - description='Ubuntu is a Linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers, and IoT devices.' + description='Ubuntu is a Linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers, and IoT devices. Ubuntu uses GNOME as the default desktop environment, while other desktop environments are also available.' badges="info:Linux" website="https://ubuntu.com" privacy-policy="https://ubuntu.com/legal/data-privacy" -- 2.47.2 From 557d222fc9e9e189dc386ea18fc304a0c4c14444 Mon Sep 17 00:00:00 2001 From: Daniel Nathan Gray Date: Fri, 17 Jul 2020 00:30:46 +0000 Subject: [PATCH 2/5] Riot becomes Element (#1991) --- _includes/sections/instant-messenger.html | 20 ++++++++++---------- _includes/sections/teamchat.html | 20 ++++++++++---------- assets/img/svg/3rd-party/element.svg | 2 ++ assets/img/svg/3rd-party/riotim.svg | 2 -- 4 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 assets/img/svg/3rd-party/element.svg delete mode 100644 assets/img/svg/3rd-party/riotim.svg diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 18c7e63b..d2a3ca96 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -71,21 +71,21 @@ {% 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.' + title="Element" + image="/assets/img/svg/3rd-party/element.svg" + description='Element (formerly Riot) 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" + website="https://element.io" + privacy-policy="https://element.io/privacy" forum="https://forum.privacytools.io/t/discussion-riot-im/665/" github="https://github.com/vector-im/riot-web/" - windows="https://riot.im/download/desktop/" - mac="https://riot.im/download/desktop/" + windows="https://element.io/get-started" + mac="https://element.io/get-started" linux="https://riot.im/download/desktop/" - fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha" + fdroid="https://f-droid.org/packages/im.vector.alpha" googleplay="https://play.google.com/store/apps/details?id=im.vector.app" - ios="https://itunes.apple.com/app/vector.im/id1083446067" - web="https://riot.im/app/" + ios="https://apps.apple.com/app/vector/id1083446067" + web="https://app.element.io" %}
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 5d2483f2..d874c11d 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -10,21 +10,21 @@ {% 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.
' + title="Element" + image="/assets/img/svg/3rd-party/element.svg" + description='Element (formerly Riot) 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" + website="https://element.io" + privacy-policy="https://element.io/privacy" forum="https://forum.privacytools.io/t/discussion-riot-im/665/" github="https://github.com/vector-im/riot-web/" - windows="https://riot.im/download/desktop/" - mac="https://riot.im/download/desktop/" + windows="https://element.io/get-started" + mac="https://element.io/get-started" linux="https://riot.im/download/desktop/" - fdroid="https://f-droid.org/repository/browse/?fdid=im.vector.alpha" + fdroid="https://f-droid.org/packages/im.vector.alpha" googleplay="https://play.google.com/store/apps/details?id=im.vector.app" - ios="https://itunes.apple.com/app/vector.im/id1083446067" - web="https://riot.im/app/" + ios="https://apps.apple.com/app/vector/id1083446067" + web="https://app.element.io" %} {% diff --git a/assets/img/svg/3rd-party/element.svg b/assets/img/svg/3rd-party/element.svg new file mode 100644 index 00000000..d449ae7c --- /dev/null +++ b/assets/img/svg/3rd-party/element.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/svg/3rd-party/riotim.svg b/assets/img/svg/3rd-party/riotim.svg deleted file mode 100644 index 02b85dd5..00000000 --- a/assets/img/svg/3rd-party/riotim.svg +++ /dev/null @@ -1,2 +0,0 @@ - - -- 2.47.2 From f2a26d6e99a302248b013d33da47a5e5ff3ba866 Mon Sep 17 00:00:00 2001 From: Freddy Marsden Date: Fri, 17 Jul 2020 09:39:22 +0100 Subject: [PATCH 3/5] Remove Datacell, Orange web hosting providers (#1992) --- _includes/sections/hosting-provider.html | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/_includes/sections/hosting-provider.html b/_includes/sections/hosting-provider.html index a3d49dfa..d8f9c470 100644 --- a/_includes/sections/hosting-provider.html +++ b/_includes/sections/hosting-provider.html @@ -20,20 +20,3 @@ forum="https://forum.privacytools.io/t/discussion-njalla/339" %} -{% include cardv2.html - title="Colocation: DataCell" - image="/assets/img/png/3rd-party/datacell.png" - description="DataCell is a data center providing secure colocating in Switzerland and Iceland." - website="https://datacell.is/" - privacy-policy="https://datacell.is/privacy/" - forum="https://forum.privacytools.io/t/discussion-datacell-is/342" -%} - -{% include cardv2.html - title="VPS, Hosting, & Domain: Orange Website" - image="/assets/img/png/3rd-party/orange_website.png" - description="Orange Website is an Icelandic web hosting provider that prides themselves in protecting online privacy and free speech." - website="https://www.orangewebsite.com/" - privacy-policy="https://www.orangewebsite.com/docs/privacy-policy.php" - forum="https://forum.privacytools.io/t/discussion-orange-website/343" -%} -- 2.47.2 From ae0e3d4a5a5b040951b65ec82ee2a705a3b596c5 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Fri, 17 Jul 2020 14:40:58 +0000 Subject: [PATCH 4/5] Introductory OS. --- _includes/sections/operating-systems.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 0882ebee..2bcb9902 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -1,7 +1,7 @@ -

PC Operating Systems

+

Introductory Operating Systems

{% include cardv2.html -- 2.47.2 From 74737e0ce741f037c4897bc60f95ae762ca1b751 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Sat, 18 Jul 2020 21:14:33 +0000 Subject: [PATCH 5/5] Fix nav item --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index 5db86462..670f62a4 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -86,7 +86,7 @@ - PC OS + PC OS Tor focused distributions Mobile OS Android Privacy Add-ons -- 2.47.2