From 9a4d3fbbd479d4b4da9ff8c4b2513fae881d3caa Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sat, 2 Nov 2019 22:10:01 +0000 Subject: [PATCH 01/32] DNS: Replace BlahDNS's Switzerland server with its new Finland server (#1455) --- _includes/sections/dns.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index d684e70f..4f9327e4 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -98,16 +98,16 @@ - - Switzerland, - - - - Japan, + + Finland, - Germany + Germany, + + + + Japan -- 2.47.2 From 8d6455a364a58d2c05771260b1ab93ab786c496e Mon Sep 17 00:00:00 2001 From: djoate <56777051+djoate@users.noreply.github.com> Date: Sun, 3 Nov 2019 16:05:37 +0000 Subject: [PATCH 02/32] Convert self-contained networks to cardv2 (#1459) --- .../sections/self-contained-networks.html | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/_includes/sections/self-contained-networks.html b/_includes/sections/self-contained-networks.html index 3f053bd1..8fff9811 100644 --- a/_includes/sections/self-contained-networks.html +++ b/_includes/sections/self-contained-networks.html @@ -6,33 +6,33 @@
- {% include card.html color="success" - title="Tor" - image="/assets/img/tools/Tor-Project.png" - url="https://www.torproject.org/" - tor="http://expyuzz4wqqyqhjn.onion" - footer='OS: Windows, macOS, Linux, iOS, Android (Tor Browser, Proxy other apps with Orbot), OpenBSD.' - description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool." - %} +{% include cardv2.html +title="Tor" +image="/assets/img/tools/Tor-Project.png" +description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool." +website="https://www.torproject.org/" +tor="http://expyuzz4wqqyqhjn.onion" +forum="https://forum.privacytools.io/t/discussion-tor/1589" +git="https://gitweb.torproject.org/tor.git" +%} - {% include card.html color="primary" - title="I2P Anonymous Network" - image="/assets/img/tools/I2P.png" - url="https://geti2p.net/" - footer="OS: Windows, macOS, Linux, Android, BSD / Solaris." - description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous - Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses." - %} +{% include cardv2.html +title="I2P Anonymous Network" +image="/assets/img/tools/I2P.png" +description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses." +website="https://geti2p.net/" +forum="https://forum.privacytools.io/t/discussion-i2p/1590" +github="https://github.com/i2p/" +%} - {% include card.html color="warning" - title="The Freenet Project" - image="/assets/img/tools/Freenet.png" - url="https://freenetproject.org/" - footer="OS: Windows, macOS, Linux." - description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and - has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech - on the Internet with strong anonymity protection." - %} +{% include cardv2.html +title="The Freenet Project" +image="/assets/img/tools/Freenet.png" +description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection." +website="https://freenetproject.org/" +forum="https://forum.privacytools.io/t/discussion-freenet/1591" +github="https://github.com/freenet/" +%}
-- 2.47.2 From 1e3d8cd40caec3437decbcfde02ae54593109ac0 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 4 Nov 2019 06:25:24 -0600 Subject: [PATCH 03/32] CONTRIBUTING.md: small fixes + opening issues through emails (#1445) --- .github/CONTRIBUTING.md | 47 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2e659087..03d8b62f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,6 +1,22 @@ # Contributing Guidelines -Please read this before contributing. +Please read this document in full before contributing. + +- [Rules](#rules) +- [Quality over Quantity](#quality-over-quantity) +- [Software Criteria](#software-criteria) + - [Main (All Software)](#main) + - [Providers](#providers) + - [DNS](#dns) + - [VPN](#vpn) + - [Email](#email) + - [Hardware](#hardware) + - [Software](#software) + - [Encryption](#encryption) + - [Operating Systems](#operating-systems) +- [Images](#images) +- [Licensing](#licensing) +- [Contributing via email](#contributing-via-email) ## Rules @@ -9,14 +25,16 @@ Please read this before contributing. - Be constructive. - Please feel free to *review changes* in the *files changed* tab of any pull request at any time. -- See also our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md) +- See also our [Code of Conduct](https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md) ## Quality over Quantity We're trying to keep it simple and promote the best tools, not all of them. ## Software Criteria + ### Main + - Easy to use. Could your mother use that tool or service? Usability is most important. - Cross-platform / Accessible. - Privacy respecting. @@ -26,7 +44,9 @@ We're trying to keep it simple and promote the best tools, not all of them. There can be exceptions if no software is available that meet the criteria. Note: This criteria applies to all of privacytools.io + ### Providers + - Prioritize Products by privacy respecting nationality. ### DNS @@ -37,7 +57,9 @@ Note: This criteria applies to all of privacytools.io - Preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10) ### VPN + See https://www.privacytools.io/providers/vpn/#criteria for more details. + - Prioritize Products by privacy respecting nationality. - Cannot be based in USA or UK. - Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard) @@ -46,31 +68,46 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details. - No logging policy ### Email + - Outside of USA - Support SMTP SSL - Accessible Using Open Source Software (e.g. allows IMAP) ### Hardware + - Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or equivalent (if applicable) - Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available. - Cannot lock users to a particular platform. ### Software + - Must be able to download over encrypted network (can be a mirror) - Must be Open Source Software ### Encryption + - Only verifiable encryption is to be trusted -### OSes +### Operating Systems + - Must state if recommends, depends on, or offers non-free software (contrib) - No Tracking Policy (opt-in analytics is ok) ## Images -- Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png)) -- Tool logos are 120px x 120px ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png)) +- Provider logos are 200px x 70px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/provider/Mullvad.png)) +- Tool logos are 120px x 120px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/tools/Firefox.png)) ## Licensing The content and original technology of this website is made available under the Creative Commons Zero v1.0 Universal license text. Some files or folders may include works from other projects with separate licenses, and will be marked as such. **By contributing to this repository, contributors do not necessarily agree to sign a CLA or legally transfer their copyright to the project, but they do at a minimum agree to license their work under the current license of this repository: In this case, the Creative Commons Zero v1.0 Universal.** + +## Contributing via email + +If you have a GitHub account, or are able to create a GitHub account, we ask that you do not submit issues via email. + +If you do not have a GitHub account, you may submit software recommendations or other issues via email without creating a GitHub account by emailing `privacytools@fire.fundersclub.com`. The subject line of your email will become the issue title. Your name will be included in the posted issue. + +This repository uses [@fire-bot](https://github.com/fire-bot), [a service](https://fire.fundersclub.com) from FundersClub that converts incoming emails to GitHub issues. By sending a message to the email address above, you will be sharing your email address and message content with FundersClub. FundersClub has a privacy policy at [https://fundersclub.com/catalyst-privacy-policy/](https://fundersclub.com/catalyst-privacy-policy/) you should review before using this service. Any attachments you send via this service may be stored indefinitely by FundersClub for the purpose of making them available within the submitted GitHub issue. + +You can view an example of the created issues' format at [#1444](https://github.com/privacytoolsIO/privacytools.io/issues/1444). -- 2.47.2 From 3c74311aa81e68ba0ecd31031c17264c06ffcd0e Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Wed, 6 Nov 2019 00:37:58 +0000 Subject: [PATCH 04/32] Update self_contained_networks.html correctly to cardv2 (#1467) * Fix margins * Add platform links * Update I2P logo --- .../sections/self-contained-networks.html | 31 +++++++++++++++--- assets/img/tools/I2P-dark.png | Bin 0 -> 2650 bytes assets/img/tools/I2P.png | Bin 3311 -> 2740 bytes 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 assets/img/tools/I2P-dark.png diff --git a/_includes/sections/self-contained-networks.html b/_includes/sections/self-contained-networks.html index 8fff9811..56ab0d4a 100644 --- a/_includes/sections/self-contained-networks.html +++ b/_includes/sections/self-contained-networks.html @@ -4,8 +4,6 @@ If you are currently browsing clearnet and want to access the dark web, this section is for you. -
- {% include cardv2.html title="Tor" image="/assets/img/tools/Tor-Project.png" @@ -13,16 +11,35 @@ description="The Tor network is a group of volunteer-operated servers that allow website="https://www.torproject.org/" tor="http://expyuzz4wqqyqhjn.onion" forum="https://forum.privacytools.io/t/discussion-tor/1589" +windows="https://www.torproject.org/download/" +mac="https://www.torproject.org/download/" +linux="https://www.torproject.org/download/" +freebsd="https://www.freshports.org/security/tor" +openbsd="http://openports.se/net/tor" +netbsd="http://pkgsrc.se/net/tor" +fdroid="https://support.torproject.org/tormobile/tormobile-7/" +googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser" +android="https://www.torproject.org/download/#android" git="https://gitweb.torproject.org/tor.git" %} {% include cardv2.html title="I2P Anonymous Network" image="/assets/img/tools/I2P.png" +image-dark="/assets/img/tools/I2P-dark.png" description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses." website="https://geti2p.net/" forum="https://forum.privacytools.io/t/discussion-i2p/1590" -github="https://github.com/i2p/" +windows="https://geti2p.net/en/download#windows" +mac="https://geti2p.net/en/download#mac" +linux="https://geti2p.net/en/download#unix" +freebsd="https://www.freshports.org/security/i2p/" +openbsd="http://openports.se/net/i2pd" +netbsd="http://pkgsrc.se/wip/i2pd" +fdroid="https://f-droid.org/app/net.i2p.android.router" +googleplay="https://play.google.com/store/apps/details?id=net.i2p.android" +android="https://download.i2p2.de/android/current/" +source="https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code" %} {% include cardv2.html @@ -31,11 +48,15 @@ image="/assets/img/tools/Freenet.png" description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection." website="https://freenetproject.org/" forum="https://forum.privacytools.io/t/discussion-freenet/1591" +windows="https://freenetproject.org/pages/download.html#windows" +mac="https://freenetproject.org/pages/download.html#os-x" +linux="https://freenetproject.org/pages/download.html#gnulinux-posix" +freebsd="https://freenetproject.org/pages/download.html#gnulinux-posix" +openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix" +netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix" github="https://github.com/freenet/" %} -
-

Related Information

🥇 Gold Sponsorship - Info
We will not provide...

We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.

Tax and Financial Information
-

Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is tax deductible. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

+

Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is tax deductible. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

More Information

If you are interested and have further questions, you are welcome to reach out to us directly at sponsors@privacytools.io.

-- 2.47.2 From f9f048e7f4e45ef1536806cfa54069805784c5cc Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Thu, 7 Nov 2019 22:23:44 -0600 Subject: [PATCH 08/32] Update head.html --- _includes/head.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/head.html b/_includes/head.html index 74eeb9ad..b718dea9 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -43,6 +43,7 @@ "https://blog.privacytools.io", "https://twitter.com/privacytoolsIO", "https://social.privacytools.io/@privacytools", + "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg", "https://github.com/privacytoolsIO" ] } -- 2.47.2 From 430a2ccdfc0a0685be79cddd8afe89c168c6a3cd Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 8 Nov 2019 16:40:37 -0600 Subject: [PATCH 09/32] Adding some SEO metadata (#1474) * Add breadcrumbs * Update cardv2.html * Dark mode fix --- _includes/breadcrumbs.html | 22 ++++++++++++++++++ _includes/cardv2.html | 46 +++++++++++++++++++++----------------- _layouts/page.html | 2 ++ assets/css/dark.scss | 3 ++- 4 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 _includes/breadcrumbs.html diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html new file mode 100644 index 00000000..faf4cf51 --- /dev/null +++ b/_includes/breadcrumbs.html @@ -0,0 +1,22 @@ + diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 26eeb34c..da9220ca 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -64,6 +64,7 @@
Website @@ -71,6 +72,7 @@ {% if include.forum %} Forum @@ -79,6 +81,7 @@ {% if include.tor %} {% if include.windows %} {% if include.windows != "" %} - + {% else %} @@ -111,7 +115,7 @@ {% if include.mac %} {% if include.mac != "" %} - + {% else %} @@ -121,7 +125,7 @@ {% if include.linux %} {% if include.linux != "" %} - + {% else %} @@ -131,7 +135,7 @@ {% if include.freebsd %} {% if include.freebsd != "" %} - + {% else %} @@ -141,7 +145,7 @@ {% if include.openbsd %} {% if include.openbsd != "" %} - + {% else %} @@ -151,7 +155,7 @@ {% if include.netbsd %} {% if include.netbsd != "" %} - + {% else %} @@ -161,7 +165,7 @@ {% if include.firefox %} {% if include.firefox != "" %} - + {% else %} @@ -171,7 +175,7 @@ {% if include.chrome %} {% if include.chrome != "" %} - + {% else %} @@ -181,7 +185,7 @@ {% if include.safari %} {% if include.safari != "" %} - + {% else %} @@ -191,7 +195,7 @@ {% if include.opera %} {% if include.opera != "" %} - + {% else %} @@ -201,7 +205,7 @@ {% if include.edge %} {% if include.edge != "" %} - + {% else %} @@ -211,7 +215,7 @@ {% if include.fdroid %} {% if include.fdroid != "" %} - + {% else %} @@ -221,7 +225,7 @@ {% if include.googleplay %} {% if include.googleplay != "" %} - + {% else %} @@ -231,7 +235,7 @@ {% if include.android %} {% if include.android != "" %} - + {% else %} @@ -241,7 +245,7 @@ {% if include.ios %} {% if include.ios != "" %} - + {% else %} @@ -251,7 +255,7 @@ {% if include.sailfish %} {% if include.sailfish != "" %} - + {% else %} @@ -261,7 +265,7 @@ {% if include.web %} {% if include.web != "" %} - + {% else %} @@ -274,25 +278,25 @@ {{include.icon3}} {% if include.github %} - + {% endif %} {% if include.gitlab %} - + {% endif %} {% if include.git %} - + {% endif %} {% if include.source %} - + {% endif %} diff --git a/_layouts/page.html b/_layouts/page.html index 4a137c66..fbdb45fd 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -2,6 +2,8 @@ layout: default --- +{% include breadcrumbs.html %} +

{{ page.title }}

{% if page.description and page.hidedesc != true %}

{{ page.description }}

{% endif %} diff --git a/assets/css/dark.scss b/assets/css/dark.scss index af63f410..15a42a0e 100644 --- a/assets/css/dark.scss +++ b/assets/css/dark.scss @@ -125,7 +125,8 @@ img { .card, .jumbotron, -.list-group-item { +.list-group-item, +ol.breadcrumb { background: $dark-800; } -- 2.47.2 From 7207511b6415cb9ab8fcb2f9c0d76de3d6438267 Mon Sep 17 00:00:00 2001 From: Jonah Date: Fri, 8 Nov 2019 21:06:02 -0600 Subject: [PATCH 10/32] Add production_url variable --- _config.yml | 1 + _includes/footer.html | 18 +++++++++--------- _includes/head.html | 7 ++++--- _includes/sections/header.html | 2 +- pages/donate.html | 2 +- pages/privacy.md | 8 ++++---- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/_config.yml b/_config.yml index 4ddde023..25a9c243 100644 --- a/_config.yml +++ b/_config.yml @@ -2,6 +2,7 @@ title: PrivacyTools - Encryption Against Global Mass Surveillance name: PrivacyTools description: You are being watched. PrivacyTools provides knowledge, encryption, and software recommendations to protect you against global mass surveillance. url: "https://www.privacytools.io" +production_url: "https://www.privacytools.io" sass: style: compressed plugins: diff --git a/_includes/footer.html b/_includes/footer.html index c6c7c667..edf5ffba 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -6,36 +6,36 @@
- - - -
- - - -
@@ -44,7 +44,7 @@

Copy URL and Description

- + For easy copy and paste. Share this text snippet.

diff --git a/_includes/head.html b/_includes/head.html index b718dea9..e19585bf 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -9,6 +9,7 @@ + {% if page.title %} @@ -20,7 +21,7 @@ {% endif %} - + @@ -37,8 +38,8 @@ "Privacy Tools", "privacytoolsIO" ], - "url": "https://www.privacytools.io", - "logo": "https://www.privacytools.io/assets/img/layout/logo.png", + "url": "{{ site.production_url }}", + "logo": "{{ site.production_url }}/assets/img/layout/logo.png", "sameAs": [ "https://blog.privacytools.io", "https://twitter.com/privacytoolsIO", diff --git a/_includes/sections/header.html b/_includes/sections/header.html index 3ae0a354..9f19b368 100644 --- a/_includes/sections/header.html +++ b/_includes/sections/header.html @@ -3,7 +3,7 @@
-

{{ site.name }}

+

{{ site.name }}

You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. {{ site.name }} provides services, tools and knowledge to protect your privacy against global mass surveillance.

diff --git a/pages/donate.html b/pages/donate.html index 1592d195..19ef41d5 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -7,7 +7,7 @@ permalink: /donate/
- {{ site.name }} + {{ site.name }}
diff --git a/pages/privacy.md b/pages/privacy.md index 51e221d3..4ba67d37 100644 --- a/pages/privacy.md +++ b/pages/privacy.md @@ -1,13 +1,13 @@ --- layout: page permalink: /privacy/ -title: "Privacy Q&A" +title: "Privacy Q&A" description: "This Privacy Statement explains what information PrivacyTools and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services." --- ## Who is {{ site.name }}? -{{ site.name }} is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytoolsIO/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC, which also collects payments and donations on the {{ site.name }} team's behalf. +{{ site.name }} is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytoolsIO/people). In order to operate these services, {{ site.name }} receives hosting and administration services from Aragon Ventures LLC. ## How does {{ site.name }} collect data about me? @@ -110,7 +110,7 @@ Anoka, MN 55303 United States ``` -For all other inquiries, you can contact the team via methods described on our [contact page](https://www.privacytools.io/contact/). +For all other inquiries, you can contact the team via methods described on our [contact page]({{ site.production_url }}/contact/). For complaints under GDPR more generally, European Union users may lodge complaints with their local data protection supervisory authorities. @@ -118,6 +118,6 @@ For complaints under GDPR more generally, European Union users may lodge complai This version of our privacy statement took effect October 9th, 2019. -We will post any new versions of this statement at [https://www.privacytools.io/privacy/](https://www.privacytools.io/privacy/). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to [https://www.privacytools.io/privacy/](https://www.privacytools.io/privacy/) for the latest contact information at any time. +We will post any new versions of this statement at [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/) for the latest contact information at any time. A full [revision history](https://github.com/privacytoolsIO/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub. -- 2.47.2 From f255fe19a4035bf282526d142a278b3d66dfd692 Mon Sep 17 00:00:00 2001 From: Jonah Date: Sat, 9 Nov 2019 00:19:36 -0600 Subject: [PATCH 11/32] Redirect webrtc.html --- nginx/020-redirects.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nginx/020-redirects.conf b/nginx/020-redirects.conf index b327e941..d0689f16 100644 --- a/nginx/020-redirects.conf +++ b/nginx/020-redirects.conf @@ -4,6 +4,9 @@ location = /old/ { location = /privacy-policy/ { return 301 /privacy/; } +location = /webrtc.html { + return 301 /browsers/; +} location = /software/im/ { return 301 /software/real-time-communication/; } -- 2.47.2 From 4b60a4d211a557dd2e4b072b0688279a924f28d5 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sat, 9 Nov 2019 12:42:13 -0600 Subject: [PATCH 12/32] Add team page (#1473) * Add team page * Add biographies Co-Authored-By: nitrohorse <1514352+nitrohorse@users.noreply.github.com> * Add links to navbar * Add trai_dep's bio * Add info about us and our mission * Update bios Co-Authored-By: Mikaela Suomalainen Co-Authored-By: Dan Arel * Replace contact page with about us page * Fix footer link * Make up bios for the lazy team members Plus, they are all more aesthetically pleasing for @danarel. * Update bio Co-Authored-By: Dawid Potocki * Update bio Co-Authored-By: Dawid Potocki * Apply suggestions from code review Co-Authored-By: Dawid Potocki Co-Authored-By: Mikaela Suomalainen --- _includes/footer.html | 4 +- _includes/head.html | 4 +- _includes/nav.html | 74 +++++++--------- _includes/team.html | 44 ++++++++++ assets/img/layout/shield.png | Bin 0 -> 33260 bytes assets/img/team/blacklight447.png | Bin 0 -> 23295 bytes assets/img/team/burung.jpg | Bin 0 -> 57362 bytes assets/img/team/danarel.jpg | Bin 0 -> 21620 bytes assets/img/team/dawid.png | Bin 0 -> 73483 bytes assets/img/team/dngray.png | Bin 0 -> 1537 bytes assets/img/team/jonah.png | Bin 0 -> 355547 bytes assets/img/team/mikaela.png | Bin 0 -> 285800 bytes assets/img/team/nitrohorse.jpg | Bin 0 -> 10812 bytes assets/img/team/trai_dep.jpg | Bin 0 -> 291421 bytes nginx/020-redirects.conf | 3 + pages/about.html | 140 ++++++++++++++++++++++++++++++ pages/contact.md | 26 ------ 17 files changed, 224 insertions(+), 71 deletions(-) create mode 100644 _includes/team.html create mode 100644 assets/img/layout/shield.png create mode 100644 assets/img/team/blacklight447.png create mode 100644 assets/img/team/burung.jpg create mode 100644 assets/img/team/danarel.jpg create mode 100644 assets/img/team/dawid.png create mode 100644 assets/img/team/dngray.png create mode 100644 assets/img/team/jonah.png create mode 100644 assets/img/team/mikaela.png create mode 100644 assets/img/team/nitrohorse.jpg create mode 100644 assets/img/team/trai_dep.jpg create mode 100644 pages/about.html delete mode 100644 pages/contact.md diff --git a/_includes/footer.html b/_includes/footer.html index edf5ffba..be325e5f 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -56,8 +56,8 @@
- - Contact + + About Us & Contact
diff --git a/_includes/head.html b/_includes/head.html index e19585bf..7091ca06 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -26,7 +26,7 @@ - {% if page.url == "/" %} + {% if page.url == "/" or page.url == "/about/" %}