From cf9cba642c54a518ad2a9ba6933cee159952a259 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Mon, 23 Sep 2019 23:50:51 +0300 Subject: [PATCH] clarify PULL_REQUST_TEMPLATE.md & CONTRIBUTING.md (#1291) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Dawid Potocki Co-authored-by: Nitrohorse <1514352+nitrohorse@users.noreply.github.com> Co-authored-by: Christer Warén --- .github/CONTRIBUTING.md | 13 ++++++++----- .github/PULL_REQUEST_TEMPLATE.md | 12 +++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e3065f8c..bbd01202 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 @@ -17,7 +20,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 +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 free software (i.e OpenVPN, WireGuard) +- Must be accessible via Open Source Software (i.e OpenVPN, WireGuard) - Use Encryption - Accept Cryptocurrency - No logging policy @@ -45,16 +48,16 @@ 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) +- 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. ### 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 88e4f94f..d7db7e34 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,19 +1,17 @@ - + ## 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). - -- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues). +- [ ] 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: -* Code Repository (if applicable): +* Code repository of the project (if applicable):