From 73f9ccb76d639b7e5e0fa203425d247396f8ec8b Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Mon, 20 Apr 2020 21:08:58 -0700 Subject: [PATCH 1/6] Cleanup search engines --- _includes/sections/search-engines.html | 67 ++++++++++++-------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index ad710454..1771de4f 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -1,52 +1,45 @@

Privacy Respecting Search Engines

-{% include cardv2.html -title="searx - Decentral" -image="/assets/img/svg/3rd-party/searx.svg" -description='searx is an open-source metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. There is a list of public instances or you can try the PrivacyTools instance.' -website="https://searx.me/" -tor="http://ulrn6sryqaifefld.onion" -forum="https://forum.privacytools.io/t/discussion-searx/283" -github="https://github.com/asciimoo/searx" +{% + include cardv2.html + title="Searx" + image="/assets/img/svg/3rd-party/searx.svg" + description='Searx is an open-source, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a list of public instances or you can try the PrivacyTools instance.' + website="https://searx.me/" + tor="http://ulrn6sryqaifefld.onion" + forum="https://forum.privacytools.io/t/discussion-searx/283" + github="https://github.com/asciimoo/searx" %} -{% include cardv2.html -title="DuckDuckGo - USA" -image="/assets/img/svg/3rd-party/duckduckgo.svg" -description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. The company is based in the USA.' -website="https://duckduckgo.com/" -tor="http://3g2upl4pq6kufc4m.onion" -forum="https://forum.privacytools.io/t/discussion-duckduckgo/285" -github="https://github.com/duckduckgo" +{% + include cardv2.html + title="DuckDuckGo" + image="/assets/img/svg/3rd-party/duckduckgo.svg" + description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. The company is based in the USA.' + website="https://duckduckgo.com/" + tor="http://3g2upl4pq6kufc4m.onion" + forum="https://forum.privacytools.io/t/discussion-duckduckgo/285" + github="https://github.com/duckduckgo" %} -{% include cardv2.html -title="Qwant - France" -image="/assets/img/svg/3rd-party/qwant.svg" -description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013.' -website="https://www.qwant.com/" -forum="https://forum.privacytools.io/t/discussion-qwant/286" -github="https://github.com/Qwant/" +{% + include cardv2.html + title="Qwant" + image="/assets/img/svg/3rd-party/qwant.svg" + description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. The company is based in France.' + website="https://www.qwant.com/" + forum="https://forum.privacytools.io/t/discussion-qwant/286" + github="https://github.com/Qwant/" %} - -

Firefox Addon

- - -

Worth Mentioning

-- 2.40.1 From 538b5b40a01a563fd73c00616b55d6c46c630cec Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Mon, 20 Apr 2020 21:25:53 -0700 Subject: [PATCH 2/6] Add privacy policy links to DDG and Qwant --- _includes/cardv2.html | 9 +++++++++ _includes/sections/search-engines.html | 2 ++ 2 files changed, 11 insertions(+) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 1a6c1e37..031f52ab 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -69,6 +69,15 @@ Website + {% if include.privacy-policy %} + + + Privacy Policy + + {% endif %} {% if include.forum %} The company is based in the USA.' website="https://duckduckgo.com/" + privacy-policy="https://duckduckgo.com/privacy" tor="http://3g2upl4pq6kufc4m.onion" forum="https://forum.privacytools.io/t/discussion-duckduckgo/285" github="https://github.com/duckduckgo" @@ -32,6 +33,7 @@ image="/assets/img/svg/3rd-party/qwant.svg" description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. The company is based in France.' website="https://www.qwant.com/" + privacy-policy="https://about.qwant.com/legal/privacy/" forum="https://forum.privacytools.io/t/discussion-qwant/286" github="https://github.com/Qwant/" %} -- 2.40.1 From c86fed021304ce8fdd4078ebacec11711c5311f4 Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Mon, 20 Apr 2020 21:31:07 -0700 Subject: [PATCH 3/6] Use tab for warning banner --- _includes/sections/search-engines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index 0d40f286..80446afb 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -1,7 +1,7 @@

Privacy Respecting Search Engines

{% -- 2.40.1 From 1cc8027bb04475f73d494c5bd094429c278705da Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Fri, 24 Apr 2020 19:06:33 -0700 Subject: [PATCH 4/6] Add source code link for Yacy --- _includes/sections/search-engines.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index 80446afb..06215869 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -41,7 +41,7 @@

Worth Mentioning

-- 2.40.1 From 7481758a67bfd596e3a7d4715c3a76858fabcd59 Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sun, 26 Apr 2020 00:38:29 -0700 Subject: [PATCH 5/6] Use 2 spaces for consistency --- _includes/sections/search-engines.html | 58 +++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index 06215869..0a7dd6c3 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -1,47 +1,47 @@

Privacy Respecting Search Engines

{% - include cardv2.html - title="Searx" - image="/assets/img/svg/3rd-party/searx.svg" - description='Searx is an open-source, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a list of public instances or you can try the PrivacyTools instance.' - website="https://searx.me/" - tor="http://ulrn6sryqaifefld.onion" - forum="https://forum.privacytools.io/t/discussion-searx/283" - github="https://github.com/asciimoo/searx" +include cardv2.html +title="Searx" +image="/assets/img/svg/3rd-party/searx.svg" +description='Searx is an open-source, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a list of public instances or you can try the PrivacyTools instance.' +website="https://searx.me/" +tor="http://ulrn6sryqaifefld.onion" +forum="https://forum.privacytools.io/t/discussion-searx/283" +github="https://github.com/asciimoo/searx" %} {% - include cardv2.html - title="DuckDuckGo" - image="/assets/img/svg/3rd-party/duckduckgo.svg" - description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. The company is based in the USA.' - website="https://duckduckgo.com/" - privacy-policy="https://duckduckgo.com/privacy" - tor="http://3g2upl4pq6kufc4m.onion" - forum="https://forum.privacytools.io/t/discussion-duckduckgo/285" - github="https://github.com/duckduckgo" +include cardv2.html +title="DuckDuckGo" +image="/assets/img/svg/3rd-party/duckduckgo.svg" +description='DuckDuckGo is a "search engine that doesn\'t track you." Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. The company is based in the USA.' +website="https://duckduckgo.com/" +privacy-policy="https://duckduckgo.com/privacy" +tor="http://3g2upl4pq6kufc4m.onion" +forum="https://forum.privacytools.io/t/discussion-duckduckgo/285" +github="https://github.com/duckduckgo" %} {% - include cardv2.html - title="Qwant" - image="/assets/img/svg/3rd-party/qwant.svg" - description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. The company is based in France.' - website="https://www.qwant.com/" - privacy-policy="https://about.qwant.com/legal/privacy/" - forum="https://forum.privacytools.io/t/discussion-qwant/286" - github="https://github.com/Qwant/" +include cardv2.html +title="Qwant" +image="/assets/img/svg/3rd-party/qwant.svg" +description='Qwant is a search engine with its philosophy based on two principles: no user tracking and no filter bubble. The company is based in France.' +website="https://www.qwant.com/" +privacy-policy="https://about.qwant.com/legal/privacy/" +forum="https://forum.privacytools.io/t/discussion-qwant/286" +github="https://github.com/Qwant/" %}

Worth Mentioning

-- 2.40.1 From df21d3d33692ba3beb2b450d907af9de5f92e1bc Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sun, 26 Apr 2020 00:41:03 -0700 Subject: [PATCH 6/6] Add privacy policy links for Metager and Mojeek --- _includes/sections/search-engines.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index 0a7dd6c3..ca7d4996 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -41,7 +41,7 @@ github="https://github.com/Qwant/"

Worth Mentioning

-- 2.40.1