From 847db5b5796e638c1e343e34bd411ce373a4bff9 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 08:16:15 -0600 Subject: [PATCH 01/12] Update new-alternative.md per #131 --- .github/ISSUE_TEMPLATE/new-alternative.md | 33 ++++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/new-alternative.md b/.github/ISSUE_TEMPLATE/new-alternative.md index 7c68a37..03f4cb0 100644 --- a/.github/ISSUE_TEMPLATE/new-alternative.md +++ b/.github/ISSUE_TEMPLATE/new-alternative.md @@ -7,10 +7,35 @@ assignees: '' --- -**Service name**: *enter service name here. Required* +### Details -**Service URL**: *service URL here. Required* +- **Service name**: { Service name here. Required } +- **Service URL**: { Service URL here. Required } +- **5/9/14 eyes**: { yes/no/unknown } +- **Description**: { detail why this service should be added } -**5/9/14 eyes?**: yes/no/unknown +### Checklist -**Description**: *detail why this service should be added. Include details such as pricing and privacy.* +[//]: # ( Fill out to the best of your ability. ) +[//]: # ( If an item is not applicable, such as HTTPS for an App, feel free to leave it blank. ) + +- **FLOSS** + - Repository: { link to source code repository } + - Active: { yes/no } (any branch in source repo active within past four months, excluding translations) + - Download: { F-Droid/Direct/Play Store } (Direct is direct downloads, such as GitHub releases) + - Price: { free/paid/freemium } (free = no payments at all; paid = no free tier excluding trials; freemium = any mix of free tier and paid plans) + - Self-host: { yes/no/only } (use only if the only option is self hosting; for example, LibreOffice Online) +- **Encryption** + - HTTPS: { yes/no } + - E2EE: { yes/no/optional } + - Modern Encryption: { yes/no } +- **Transparency** + - Public ownership: { yes/no } [Parent company name](https://parent.company.url) + - 3rd-party audits: { yes/no } [Link to audit history](https://audit.history.url) +- **Privacy** + - Anonymous payments: { yes/no } (these types of payments can include cash, cryptocurrency, gift cards) + - Analytics: { yes/no } { type of analytics } + - Captcha: { recaptcha/hcaptcha/other } +- **Extras** + - .onion address: { .onion address } + - Warrant canary: { yes/no } [Link to canary](https://warrant.canary.url) From bf2f0613794c84aafd6eb5918f16a05adf13db39 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 08:33:50 -0600 Subject: [PATCH 02/12] Update CONTRIBUTING.md --- CONTRIBUTING.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 494aab9..d8c9b39 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,17 +1,20 @@ # Contributing -Contributing is simple enough, just make sure to try and follow these guidelines to ensure your Issue/PR is dealt with faster: +### General -1. If possible, please [open an Issue](https://github.com/tycrek/degoogle/issues/new/choose) before opening a Pull Request. We can use Issue's for discussion on adding/removing/modifying alternatives. -2. English only for Issues & Pull Requests. -3. Try to fill out as much info as you can. This makes it easier for me to quickly approve changes. -4. No personal opinions on why a service should be removed. Links to articles with details is much more helpful. -5. Try to use the Issue templates if possible, but they are not necessary. -6. Try to limit yourself to ONE alternative per Issue. Pull Requests are OK to have multiple additions. +1. **[Open an Issue](https://github.com/tycrek/degoogle/issues/new/choose) before opening a Pull Request**. We can use Issue's for discussion on adding/removing/modifying alternatives. +2. **English only** for Issues & Pull Requests. +3. As of May 25 2020, the `README.md` file is automatically generated. Please edit anything in `yaml/` or `md/`. +4. If you submitted a change that made it into the guide but don't have your Reddit or GitHub username in the [CONTRIBUTORS.md](../blob/master/CONTRIBUTORS.md) list, open an Issue or Pull Request so we can fix it, or update your existing Issue with the request. Alternatively, if your username is on the list and you do *not* want it there, feel free to request this as well. + +### New alternatives + +1. **Use the Issue template.** +2. **Fill out as much info as you can**. This makes it easier for maintainers to quickly approve changes. +2. Limit yourself to **one** alternative per Issue. 7. Check to see if the alternative you want added already exists in the guide. -If you submitted a change that made it into the guide but don't have your Reddit or GitHub username on the [CONTRIBUTORS.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md) list, let me know! Sometimes I forget. Alternatively, if your username is on the list and you do *not* want it there, let me know. +### Removing alternatives -# What to edit - -As of May 24/25 2020, the `README.md` file is automatically generated. Please update either `degoogle.yml` or the files in `md/`. +1. **No personal opinions** on why a service should be removed. Links to articles with details is much more helpful. +2. Limit yourself to **one** alternative per Issue. From 2dfdd7aec37d9ae5462e3b6e74747aded6505373 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 08:39:52 -0600 Subject: [PATCH 03/12] Update new-alternative.md --- .github/ISSUE_TEMPLATE/new-alternative.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/new-alternative.md b/.github/ISSUE_TEMPLATE/new-alternative.md index 03f4cb0..066fcbd 100644 --- a/.github/ISSUE_TEMPLATE/new-alternative.md +++ b/.github/ISSUE_TEMPLATE/new-alternative.md @@ -18,7 +18,12 @@ assignees: '' [//]: # ( Fill out to the best of your ability. ) [//]: # ( If an item is not applicable, such as HTTPS for an App, feel free to leave it blank. ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) +- **General** + - [ ] **I am affiliated with this alternative** + - [ ] **I have read the rules outlined in [CONTRIBUTING.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTING.md)** + - [ ] **Include my name in [CONTRIBUTORS.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md)** - **FLOSS** - Repository: { link to source code repository } - Active: { yes/no } (any branch in source repo active within past four months, excluding translations) From 8491d53e67792f3c3e3c0ca654a5d0b35f6bd603 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 08:44:01 -0600 Subject: [PATCH 04/12] Update new-alternative.md --- .github/ISSUE_TEMPLATE/new-alternative.md | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/new-alternative.md b/.github/ISSUE_TEMPLATE/new-alternative.md index 066fcbd..e9b01c8 100644 --- a/.github/ISSUE_TEMPLATE/new-alternative.md +++ b/.github/ISSUE_TEMPLATE/new-alternative.md @@ -7,29 +7,29 @@ assignees: '' --- -### Details - -- **Service name**: { Service name here. Required } -- **Service URL**: { Service URL here. Required } -- **5/9/14 eyes**: { yes/no/unknown } -- **Description**: { detail why this service should be added } - -### Checklist - [//]: # ( Fill out to the best of your ability. ) [//]: # ( If an item is not applicable, such as HTTPS for an App, feel free to leave it blank. ) [//]: # ( Mark off checkbox items by putting an x in between the [ ] ) +### Checklist + +- [ ] **I am affiliated with this alternative** +- [ ] **I have read the rules outlined in [CONTRIBUTING.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTING.md)** +- [ ] **Include my name in [CONTRIBUTORS.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md)** + +### Details + - **General** - - [ ] **I am affiliated with this alternative** - - [ ] **I have read the rules outlined in [CONTRIBUTING.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTING.md)** - - [ ] **Include my name in [CONTRIBUTORS.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md)** + - **Alternative name**: { Alternative name here. Required } + - **Alternative URL**: { Alternative URL here. Required } + - **5/9/14 eyes**: { yes/no/unknown } + - **Description**: { detail why this alternative should be added } - **FLOSS** - Repository: { link to source code repository } - Active: { yes/no } (any branch in source repo active within past four months, excluding translations) - Download: { F-Droid/Direct/Play Store } (Direct is direct downloads, such as GitHub releases) - - Price: { free/paid/freemium } (free = no payments at all; paid = no free tier excluding trials; freemium = any mix of free tier and paid plans) - - Self-host: { yes/no/only } (use only if the only option is self hosting; for example, LibreOffice Online) + - Price: { free/paid/freemium } (free: no payments at all; paid: no free tier excluding trials; freemium: any mix of free tier and paid plans) + - Self-host: { yes/no/only } (use "only" if the only option is self hosting; for example, LibreOffice Online) - **Encryption** - HTTPS: { yes/no } - E2EE: { yes/no/optional } From 026c5494f67243f2cf45d7c92f382380ddaec810 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 08:46:23 -0600 Subject: [PATCH 05/12] Update fix-update-alternative.md --- .../ISSUE_TEMPLATE/fix-update-alternative.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/fix-update-alternative.md b/.github/ISSUE_TEMPLATE/fix-update-alternative.md index 15b51ea..4a6ef52 100644 --- a/.github/ISSUE_TEMPLATE/fix-update-alternative.md +++ b/.github/ISSUE_TEMPLATE/fix-update-alternative.md @@ -7,10 +7,19 @@ assignees: '' --- -**Service name**: *enter name here. Required.* +[//]: # ( Fill out to the best of your ability. ) +[//]: # ( If an item is not applicable, feel free to leave it blank. ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) -**Error**: *enter what might be wrong or what should be updated.* +### Checklist -**Proposed changes**: *enter what you suggest should be added.* +- [ ] **I am affiliated with this alternative** +- [ ] **I have read the rules outlined in [CONTRIBUTING.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTING.md)** +- [ ] **Include my name in [CONTRIBUTORS.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md)** -**Additional details**: *any additional details* +### Details + +- **Alternative name**: { Enter name here. Required } +- **Error**: { Enter what might be wrong or what should be updated } +- **Proposed changes**: { enter what you suggest should be added } +- **Additional details**: { any additional details } From 955a2c3ef187e3500a77e019b5ce70a4c133d49e Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 08:48:40 -0600 Subject: [PATCH 06/12] Update remove-alternative.md --- .github/ISSUE_TEMPLATE/remove-alternative.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/remove-alternative.md b/.github/ISSUE_TEMPLATE/remove-alternative.md index 0b36860..9ea3777 100644 --- a/.github/ISSUE_TEMPLATE/remove-alternative.md +++ b/.github/ISSUE_TEMPLATE/remove-alternative.md @@ -7,6 +7,17 @@ assignees: '' --- -**Service name**: *enter service name here. Required* +[//]: # ( Fill out to the best of your ability. ) +[//]: # ( If an item is not applicable, feel free to leave it blank. ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) -**Reason**: *detail why this service should be removed. Include any relevant links. **This is not the place for personal opinions**.* +### Checklist + +- [ ] **I am affiliated with this alternative** +- [ ] **I have read the rules outlined in [CONTRIBUTING.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTING.md)** +- [ ] **Include my name in [CONTRIBUTORS.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md)** + +### Details + +- **Alternative name**: { Enter name here. Required } +- **Reason**: { detail why this alternative should be removed. Include any relevant links } From b6f4769fae4eb4ef041fb50443a64bb172d30d3e Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 08:51:29 -0600 Subject: [PATCH 07/12] Update other.md --- .github/ISSUE_TEMPLATE/other.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md index f3491b5..32b1192 100644 --- a/.github/ISSUE_TEMPLATE/other.md +++ b/.github/ISSUE_TEMPLATE/other.md @@ -8,4 +8,16 @@ assignees: '' --- +[//]: # ( Fill out to the best of your ability. ) +[//]: # ( If an item is not applicable, feel free to leave it blank. ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) + +### Checklist + +- [ ] **I am affiliated with this alternative** +- [ ] **I have read the rules outlined in [CONTRIBUTING.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTING.md)** +- [ ] **Include my name in [CONTRIBUTORS.md](https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md)** + +### Details + From a24394935424da1e5adbbc9cdb1a6cd26177acd8 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 09:16:26 -0600 Subject: [PATCH 08/12] Update .github/ISSUE_TEMPLATE/other.md Co-authored-by: Stephen Brown II --- .github/ISSUE_TEMPLATE/other.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md index 32b1192..140861f 100644 --- a/.github/ISSUE_TEMPLATE/other.md +++ b/.github/ISSUE_TEMPLATE/other.md @@ -10,7 +10,7 @@ assignees: '' [//]: # ( Fill out to the best of your ability. ) [//]: # ( If an item is not applicable, feel free to leave it blank. ) -[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] without spaces, i.e. `[x]`) ### Checklist @@ -20,4 +20,3 @@ assignees: '' ### Details - From f39dd81c001c2a788bc43c4d3b673135a3f4abd9 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 09:19:27 -0600 Subject: [PATCH 09/12] Update other.md --- .github/ISSUE_TEMPLATE/other.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md index 140861f..be5d803 100644 --- a/.github/ISSUE_TEMPLATE/other.md +++ b/.github/ISSUE_TEMPLATE/other.md @@ -10,7 +10,7 @@ assignees: '' [//]: # ( Fill out to the best of your ability. ) [//]: # ( If an item is not applicable, feel free to leave it blank. ) -[//]: # ( Mark off checkbox items by putting an x in between the [ ] without spaces, i.e. `[x]`) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] without spaces, i.e. `[x]` ) ### Checklist From f140bf27061acd92be0cf32e01333b051fee0be6 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 09:19:41 -0600 Subject: [PATCH 10/12] Update fix-update-alternative.md --- .github/ISSUE_TEMPLATE/fix-update-alternative.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/fix-update-alternative.md b/.github/ISSUE_TEMPLATE/fix-update-alternative.md index 4a6ef52..624c664 100644 --- a/.github/ISSUE_TEMPLATE/fix-update-alternative.md +++ b/.github/ISSUE_TEMPLATE/fix-update-alternative.md @@ -9,7 +9,7 @@ assignees: '' [//]: # ( Fill out to the best of your ability. ) [//]: # ( If an item is not applicable, feel free to leave it blank. ) -[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] without spaces, i.e. `[x]` ) ### Checklist From 44238c5c9c097464ce6df63f4657d59af76394f8 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 09:19:50 -0600 Subject: [PATCH 11/12] Update new-alternative.md --- .github/ISSUE_TEMPLATE/new-alternative.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/new-alternative.md b/.github/ISSUE_TEMPLATE/new-alternative.md index e9b01c8..158a631 100644 --- a/.github/ISSUE_TEMPLATE/new-alternative.md +++ b/.github/ISSUE_TEMPLATE/new-alternative.md @@ -9,7 +9,7 @@ assignees: '' [//]: # ( Fill out to the best of your ability. ) [//]: # ( If an item is not applicable, such as HTTPS for an App, feel free to leave it blank. ) -[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] without spaces, i.e. `[x]` ) ### Checklist From 8a832bb656bcab9fb4c6a641372af9a2f6ab790d Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 11 Jun 2020 09:19:55 -0600 Subject: [PATCH 12/12] Update remove-alternative.md --- .github/ISSUE_TEMPLATE/remove-alternative.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/remove-alternative.md b/.github/ISSUE_TEMPLATE/remove-alternative.md index 9ea3777..5d60604 100644 --- a/.github/ISSUE_TEMPLATE/remove-alternative.md +++ b/.github/ISSUE_TEMPLATE/remove-alternative.md @@ -9,7 +9,7 @@ assignees: '' [//]: # ( Fill out to the best of your ability. ) [//]: # ( If an item is not applicable, feel free to leave it blank. ) -[//]: # ( Mark off checkbox items by putting an x in between the [ ] ) +[//]: # ( Mark off checkbox items by putting an x in between the [ ] without spaces, i.e. `[x]` ) ### Checklist