From 632ce4463b71e7e91e9e9655613b268c868fc101 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 10 Sep 2019 22:41:55 +0300 Subject: [PATCH 1/8] clarify PULL_REQUST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 88e4f94f..8c58335d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,18 +2,18 @@ ## Description -Resolves: #none +Resolves: #none #### Check List - [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md). -- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). +- [ ] I have listed the source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). -- [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software). +- [ ] The project is [free/libre software](https://www.wikipedia.org/wiki/Free_software). -- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues). +- [ ] The project has an associated discussion: # * Netlify preview for the mainly edited page: -* Code Repository (if applicable): +* Code repository of the project (if applicable): -- 2.47.2 From 1d180ab231d4d917d5f42dba6fb22f77035fad84 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 10 Sep 2019 22:56:37 +0300 Subject: [PATCH 2/8] CONTRIBUTING & PR TEMPLATE: request OSS instead of free --- .github/CONTRIBUTING.md | 6 +++--- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e3065f8c..bbc49d9a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -37,7 +37,7 @@ Note: This criteria applies to all of privacytools.io ### VPN - Prioritize Products by privacy respecting nationality. - Cannot be based in USA or UK. -- Must be acessable via free software (i.e OpenVPN, WireGuard) +- Must be acessable via open source software (i.e OpenVPN, WireGuard) - Use Encryption - Accept Cryptocurrency - No logging policy @@ -45,7 +45,7 @@ Note: This criteria applies to all of privacytools.io ### Email - Outside of USA - Support SMTP SSL -- Accessable Using Free Software (i.e IMAP) +- Accessable Using Open source Software (i.e IMAP) ### Hardware - Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable) @@ -54,7 +54,7 @@ Note: This criteria applies to all of privacytools.io ### Software - Must be able to download over encrypted network (can be a mirror) -- Must be free software +- Must be open source software ### Encryption - Only verifiable encryption is to be trusted diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8c58335d..1469e439 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -10,7 +10,7 @@ Resolves: #none -- 2.47.2 From 8705f1606def8f106dd12cd98e5647eafaf1e763 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 13 Sep 2019 00:04:02 +0300 Subject: [PATCH 3/8] PULL_REQUEST_TEMPLATE.md: address feedback Co-authored-by: Dawid Potocki Co-authored-by: Nitrohorse <1514352+nitrohorse@users.noreply.github.com> --- .github/PULL_REQUEST_TEMPLATE.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1469e439..d7db7e34 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,8 @@ - + ## Description -Resolves: #none +Resolves: #none #### Check List @@ -10,9 +10,7 @@ Resolves: #none +- [ ] The project is [Free Libre](https://en.wikipedia.org/wiki/Free_software) and/or [Open Source](https://en.wikipedia.org/wiki/Open-source_software) Software * Netlify preview for the mainly edited page: -- 2.47.2 From d79d2f9ebd84e4e30c621649ad2d8107aa060654 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 13 Sep 2019 00:11:03 +0300 Subject: [PATCH 4/8] CONTRIBUTING.md: fix consistency Use the same capitalisation with Open Source Software --- .github/CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bbc49d9a..4031bb3d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -17,7 +17,7 @@ We're trying to keep it simple and promote the best tools, not all of them. - Easy to use. Could your mother use that tool or service? Usability is most important. - Cross-platform / Accessible. - Privacy respecting. -- Open Source / free software is preferred but not required. +- Open Source / Free Software is preferred but not required. - Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable) - Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability. @@ -37,7 +37,7 @@ Note: This criteria applies to all of privacytools.io ### VPN - Prioritize Products by privacy respecting nationality. - Cannot be based in USA or UK. -- Must be acessable via open source software (i.e OpenVPN, WireGuard) +- Must be acessable via Open Source Software (i.e OpenVPN, WireGuard) - Use Encryption - Accept Cryptocurrency - No logging policy @@ -45,7 +45,7 @@ Note: This criteria applies to all of privacytools.io ### Email - Outside of USA - Support SMTP SSL -- Accessable Using Open source Software (i.e IMAP) +- Accessable Using Open Source Software (i.e IMAP) ### Hardware - Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable) @@ -54,7 +54,7 @@ Note: This criteria applies to all of privacytools.io ### Software - Must be able to download over encrypted network (can be a mirror) -- Must be open source software +- Must be Open Source Software ### Encryption - Only verifiable encryption is to be trusted -- 2.47.2 From 78456cb55462bf9b915c6b67ab5f08b4bb389b9a Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 13 Sep 2019 00:12:51 +0300 Subject: [PATCH 5/8] CONTRIBUTING.md: fix typo --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4031bb3d..045a8863 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -48,7 +48,7 @@ Note: This criteria applies to all of privacytools.io - Accessable Using Open Source Software (i.e IMAP) ### Hardware -- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable) +- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivalant (if applicable) - Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when avalible. - Cannot lock users to a particular platform. -- 2.47.2 From 2ff1f6e816aefdb9d7be39d1ed5411c6210ca0a5 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 13 Sep 2019 00:16:12 +0300 Subject: [PATCH 6/8] CONTRIBUTING.md: welcome PR reviews (#1296) --- .github/CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 045a8863..0d11399d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,6 +7,9 @@ Please read this before contributing. - Be nice and respectful. - English only. - 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) ## Quality over Quantity -- 2.47.2 From 04ac8907296ef3e94d7b15316d1b9ccb46939c09 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 13 Sep 2019 00:23:21 +0300 Subject: [PATCH 7/8] CONTRIBUTING.md: fix typo --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0d11399d..4d696b8d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -51,7 +51,7 @@ Note: This criteria applies to all of privacytools.io - Accessable Using Open Source Software (i.e IMAP) ### Hardware -- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivalant (if applicable) +- 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 avalible. - Cannot lock users to a particular platform. -- 2.47.2 From 33933f2f8b550e613e284388417a4a22cff8d132 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 13 Sep 2019 13:15:03 +0300 Subject: [PATCH 8/8] CONTRIBUTING.md: fix another typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: Mikaela/privacytools.io#5 Co-authored-by: Christer Warén --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4d696b8d..bbd01202 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -40,7 +40,7 @@ Note: This criteria applies to all of privacytools.io ### VPN - Prioritize Products by privacy respecting nationality. - Cannot be based in USA or UK. -- Must be acessable via Open Source Software (i.e OpenVPN, WireGuard) +- Must be accessible via Open Source Software (i.e OpenVPN, WireGuard) - Use Encryption - Accept Cryptocurrency - No logging policy -- 2.47.2