From 687c5afb20c33c8c25baff149bf06361d7364c87 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Thu, 25 Jul 2024 14:53:20 -0500 Subject: [PATCH] docs: Update our list of volunteers (#2683) Signed-off-by: redoomed1 <161974310+redoomed1@users.noreply.github.com> Signed-off-by: Mare Polaris <15004290+ph00lt0@users.noreply.github.com> Signed-off-by: Freddy Signed-off-by: Niek de Wilde --- .all-contributorsrc | 97 +++++++++++++++- README.md | 22 +++- docs/{about/index.md => about.md} | 181 +++++++++++++++++------------- docs/about/donate.md | 58 +++++----- docs/mobile-phones.md | 2 +- docs/tools.md | 2 +- includes/contributors.md | 18 ++- mkdocs.yml | 9 +- modules/mkdocs-material | 2 +- 9 files changed, 268 insertions(+), 123 deletions(-) rename docs/{about/index.md => about.md} (55%) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7d944baf..148e8eca 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -464,8 +464,8 @@ "avatar_url": "https://avatars.githubusercontent.com/u/161974310?v=4", "profile": "https://github.com/redoomed1", "contributions": [ - "doc", - "review" + "review", + "doc" ] }, { @@ -1598,7 +1598,8 @@ "doc", "research", "promotion", - "question" + "question", + "review" ] }, { @@ -2763,6 +2764,96 @@ "contributions": [ "doc" ] + }, + { + "login": "antgig", + "name": "antgig", + "avatar_url": "https://avatars.githubusercontent.com/u/144840521?v=4", + "profile": "https://github.com/antgig", + "contributions": [ + "doc" + ] + }, + { + "login": "akosnikhazy", + "name": "Ákos NikhÑzy", + "avatar_url": "https://avatars.githubusercontent.com/u/604311?v=4", + "profile": "https://yzahk.in/", + "contributions": [ + "doc" + ] + }, + { + "login": "fmarier", + "name": "Francois Marier", + "avatar_url": "https://avatars.githubusercontent.com/u/167821?v=4", + "profile": "https://fmarier.org/", + "contributions": [ + "doc" + ] + }, + { + "login": "5-tom", + "name": "5-tom", + "avatar_url": "https://avatars.githubusercontent.com/u/132141431?v=4", + "profile": "https://filmsbytom.com/", + "contributions": [ + "doc" + ] + }, + { + "login": "Ralphie0511", + "name": "Ralphie0511", + "avatar_url": "https://avatars.githubusercontent.com/u/99518791?v=4", + "profile": "https://github.com/Ralphie0511", + "contributions": [ + "doc" + ] + }, + { + "login": "aleksejs1", + "name": "aleksejs1", + "avatar_url": "https://avatars.githubusercontent.com/u/5563309?v=4", + "profile": "https://kovalovs.lv/", + "contributions": [ + "doc" + ] + }, + { + "login": "snwfdhmp", + "name": "Martin", + "avatar_url": "https://avatars.githubusercontent.com/u/23099246?v=4", + "profile": "https://github.com/snwfdhmp", + "contributions": [ + "doc" + ] + }, + { + "login": "overwatcheddude", + "name": "Overwatch", + "avatar_url": "https://avatars.githubusercontent.com/u/37483931?v=4", + "profile": "https://github.com/overwatcheddude", + "contributions": [ + "doc" + ] + }, + { + "login": "m00t316", + "name": "Kieran Colfer", + "avatar_url": "https://avatars.githubusercontent.com/u/54213179?v=4", + "profile": "https://github.com/m00t316", + "contributions": [ + "doc" + ] + }, + { + "login": "I-I-IT", + "name": "Triple T", + "avatar_url": "https://avatars.githubusercontent.com/u/78900789?v=4", + "profile": "https://github.com/I-I-IT", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 5, diff --git a/README.md b/README.md index 7baf4eca..7f112360 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,7 @@ - - -

+

@@ -225,7 +223,7 @@ Privacy Guides wouldn't be possible without these wonderful people ([emoji key](
Gusted
πŸ“– -
redoomed1
πŸ“– πŸ‘€ +
redoomed1
πŸ‘€ πŸ“–
Offpics
πŸ“–
kimg45
πŸ“–
djoate
πŸ“– @@ -400,7 +398,7 @@ Privacy Guides wouldn't be possible without these wonderful people ([emoji key](
pdjpdjpdj
πŸ“– -
Stella Polaris
πŸ“– πŸ”¬ πŸ“£ πŸ’¬ +
Stella Polaris
πŸ“– πŸ”¬ πŸ“£ πŸ’¬ πŸ‘€
regaldude
πŸ“–
rusty-snake
πŸ“–
sacha
πŸ“– @@ -581,6 +579,20 @@ Privacy Guides wouldn't be possible without these wonderful people ([emoji key](
jx tsai
🌍
backstab5983
πŸ“– + +
antgig
πŸ“– +
Ákos NikhÑzy
πŸ“– +
Francois Marier
πŸ“– +
5-tom
πŸ“– +
Ralphie0511
πŸ“– + + +
aleksejs1
πŸ“– +
Martin
πŸ“– +
Overwatch
πŸ“– +
Kieran Colfer
πŸ“– +
Triple T
πŸ“– + diff --git a/docs/about/index.md b/docs/about.md similarity index 55% rename from docs/about/index.md rename to docs/about.md index b7ce89ad..482b52ad 100644 --- a/docs/about/index.md +++ b/docs/about.md @@ -16,13 +16,108 @@ schema: - https://www.youtube.com/@privacyguides - https://mastodon.neat.computer/@privacyguides --- -![Privacy Guides logo](../assets/brand/logos/png/square/pg-yellow.png){ align=right } +![Privacy Guides logo](assets/brand/logos/png/square/pg-yellow.png){ align=right } -**Privacy Guides** is a socially motivated website that provides [information](/kb) for protecting your data security and privacy. Our mission is to inform the public about the value of digital privacy, and global government initiatives which aim to monitor your online activity. We are a non-profit collective operated entirely by volunteer [team members](https://discuss.privacyguides.net/g/team) and contributors. Our website is free of advertisements and not affiliated with any of the listed providers. +**Privacy Guides** is a socially motivated website that provides information for protecting your data security and privacy. We are a non-profit project with a mission to inform the public about the value of digital privacy, and about global government initiatives which aim to monitor your online activity. Our website is free of advertisements and not affiliated with any of the listed providers. +[:octicons-heart-16:{.pg-red} Make a Donation](about/donate.md){ .md-button .md-button--primary } [:octicons-home-16:](https://www.privacyguides.org){ .card-link title=Homepage } [:octicons-code-16:](https://github.com/privacyguides/privacyguides.org){ .card-link title="Source Code" } -[:octicons-heart-16:](donate.md){ .card-link title=Contribute } + +## Executive Committee + + +The project executive committee consists of five volunteers charged with management of the [MAGIC Privacy Guides Fund](https://magicgrants.org/funds/privacy_guides), making most critical project-related decisions. + +

+ + +- :polar_bear:{ .lg .middle } **Daniel Gray** + + --- + + :material-text-account: Founder + + [:material-account: Profile](https://discuss.privacyguides.net/u/dngray) + + [:simple-github:]( "GitHub") + [:simple-mastodon:](https://mastodon.social/@dngray "@dngray@mastodon.social"){rel=me} + [:material-email:](mailto:dngray@privacyguides.org "Email") + +- :detective:{ .lg .middle } **Freddy** + + --- + + :material-text-account: Founder + + [:material-account: Profile](https://discuss.privacyguides.net/u/freddy) + + [:simple-github:](https://github.com/freddy-m "GitHub") + [:simple-mastodon:](https://social.lol/@freddy "@freddy@social.lol"){rel=me} + [:material-email:](mailto:freddy@privacyguides.org "Email") + +- :robot:{ .lg .middle } **Jonah Aragon** + + --- + + :material-text-account: Founder + + [:material-account: Profile](https://discuss.privacyguides.net/u/jonah) + + [:simple-github:](https://github.com/jonaharagon "GitHub") + [:simple-mastodon:](https://mastodon.neat.computer/@jonah "@jonah@neat.computer"){rel=me} + [:material-email:](mailto:jonah@privacyguides.org "Email") + +- :cactus:{ .lg .middle } **Niek de Wilde** + + --- + + :material-text-account: Founder + + [:material-account: Profile](https://discuss.privacyguides.net/u/Niek-de-Wilde) + + [:simple-github:](https://github.com/blacklight447 "GitHub") + [:simple-mastodon:](https://mastodon.social/@blacklight447 "@blacklight447@mastodon.social"){rel=me} + [:material-email:](mailto:niekdewilde@privacyguides.org "Email") + +- :smirk_cat:{ .lg .middle } **Olivia** + + --- + + :material-text-account: Founder + + [:material-account: Profile](https://discuss.privacyguides.net/u/olivia) + + [:simple-github:](https://github.com/hook9 "GitHub") + [:simple-mastodon:](https://mastodon.neat.computer/@oliviablob "@oliviablob@neat.computer"){rel=me} + +
+ +## Volunteer Team + +A number of other contributors have volunteered their time to review and approve changes to this website, and keep the website up to date. Changes require 2+ approvals from team members before they can be merged. In addition to the executive committee members above, volunteers [trusted](https://github.com/orgs/privacyguides/people) to review pull requests include: + +
+ +- [:simple-github: **kimg45**](https://github.com/kimg45) +- [:simple-github: **ph00lt0**](https://github.com/ph00lt0) +- [:simple-github: **redoomed1**](https://github.com/redoomed1) + +
+ +We also especially thank our dedicated moderation team on Matrix and our forum: *Austin Huang*, *namazso*, *hik*, *riley*, and *Valynor*. + +Additionally, [many other people](about/contributors.md) have made contributions to the project. You can too! We're open source on GitHub, and accepting translation suggestions on [Crowdin](https://crowdin.com/project/privacyguides). + +Our team members review all changes made to the website and direct the course of the project as a whole. They do not personally profit from any contributions made to this site. Donations to Privacy Guides are generally tax-deductible in the United States. + +## In The Media > To find [privacy-focused alternative] apps, check out sites like Good Reports and **Privacy Guides**, which list privacy-focused apps in a variety of categories, notably including email providers (usually on paid plans) that aren’t run by the big tech companies. @@ -36,89 +131,13 @@ Also featured on: [Ars Technica](https://arstechnica.com/gadgets/2022/02/is-fire ## History -Privacy Guides was launched in September 2021 as a continuation of the [defunct](privacytools.md) "PrivacyTools" open-source educational project. We recognized the importance of independent, criteria-focused product recommendations and general knowledge in the privacy space, which is why we needed to preserve the work that had been created by so many contributors since 2015 and make sure that information had a stable home on the web indefinitely. +Privacy Guides was launched in September 2021 as a continuation of the [defunct](about/privacytools.md) "PrivacyTools" open-source educational project. We recognized the importance of independent, criteria-focused product recommendations and general knowledge in the privacy space, which is why we needed to preserve the work that had been created by so many contributors since 2015 and make sure that information had a stable home on the web indefinitely. In 2022, we completed the transition of our main website framework from Jekyll to MkDocs, using the `mkdocs-material` documentation software. This change made open-source contributions to our site significantly easier for outsiders, because instead of needing to know complicated syntax to write posts effectively, contributing is now as easy as writing a standard Markdown document. We additionally launched our new discussion forum at [discuss.privacyguides.net](https://discuss.privacyguides.net) as a community platform to share ideas and ask questions about our mission. This augments our existing community on Matrix, and replaced our previous GitHub Discussions platform, decreasing our reliance on proprietary discussion platforms. -So far in 2023 we've launched international translations of our website in [French](/fr/), [Hebrew](/he/), and [Dutch](/nl/), with more languages on the way, made possible by our excellent translation team on [Crowdin](https://crowdin.com/project/privacyguides). We plan to continue carrying forward our mission of outreach and education, and finding ways to more clearly highlight the dangers of a lack of privacy awareness in the modern digital age, and the prevalence and harms of security breaches across the technology industry. - -## Our Team - - -
- - -- :robot:{ .lg .middle } **@jonah** - - --- - - :material-text-account: Founder - - [:material-account: Profile](https://discuss.privacyguides.net/u/jonah) - - [:material-home: Homepage](https://www.jonaharagon.com) - - [:material-email: Email](mailto:jonah@privacyguides.org) - -- :cactus:{ .lg .middle } **@niek-de-wilde** - - --- - - :material-text-account: Founder - - [:material-account: Profile](https://discuss.privacyguides.net/u/Niek-de-Wilde) - - [:simple-mastodon: Mastodon](https://mastodon.social/@blacklight447 "@blacklight447@mastodon.social"){rel=me} - - [:material-email: Email](mailto:niekdewilde@privacyguides.org) - -- :polar_bear:{ .lg .middle } **@dngray** - - --- - - :material-text-account: Founder - - [:material-account: Profile](https://discuss.privacyguides.net/u/dngray) - - [:simple-mastodon: Mastodon](https://mastodon.social/@dngray "@dngray@mastodon.social"){rel=me} - - [:material-email: Email](mailto:dngray@privacyguides.org) - -- :detective:{ .lg .middle } **@freddy** - - --- - - :material-text-account: Founder - - [:material-account: Profile](https://discuss.privacyguides.net/u/freddy) - - [:simple-mastodon: Mastodon](https://social.lol/@freddy "@freddy@social.lol"){rel=me} - - [:material-email: Email](mailto:freddy@privacyguides.org) - -- :smirk_cat:{ .lg .middle } **@olivia** - - --- - - :material-text-account: Founder - - [:material-account: Profile](https://discuss.privacyguides.net/u/olivia) - - [:simple-mastodon: Mastodon](https://mastodon.neat.computer/@oliviablob "@oliviablob@neat.computer"){rel=me} - -
- -Additionally, [many people](contributors.md) have made contributions to the project. You can too, we're open source on GitHub, and accepting translation suggestions on [Crowdin](https://crowdin.com/project/privacyguides). - -Our team members review all changes made to the website and handle administrative duties such as web hosting and financials, however they do not personally profit from any contributions made to this site. Donations to Privacy Guides are generally tax-deductible in the United States. +In 2023, we launched international translations of our website in [French](/fr/), [Hebrew](/he/), [Dutch](/nl/), and more languages, made possible by our excellent translation team on [Crowdin](https://crowdin.com/project/privacyguides). We plan to continue carrying forward our mission of outreach and education, and finding ways to more clearly highlight the dangers of a lack of privacy awareness in the modern digital age, and the prevalence and harms of security breaches across the technology industry. ## Site License diff --git a/docs/about/donate.md b/docs/about/donate.md index 001d2fe6..f15d852c 100644 --- a/docs/about/donate.md +++ b/docs/about/donate.md @@ -1,8 +1,10 @@ --- -title: Supporting Us +title: Donate --- -It takes a lot of [people](contributors.md) and [work](https://github.com/privacyguides/privacyguides.org/pulse/monthly) to keep Privacy Guides up to date and spreading the word about privacy and mass surveillance. If you like what we do, consider getting involved by [editing the site](https://github.com/privacyguides/privacyguides.org) or [contributing translations](https://crowdin.com/project/privacyguides). +Donate to Privacy Guides and support our mission to defend digital rights and spread the word about mass surveillance programs and other daily privacy invasions. You can help Privacy Guides researchers, activists, and maintainers create informative content, host private digital services, and protect privacy rights at a time when the world needs it most. + +Privacy Guides has been a nonstop effort for over 5 years to stay up to date with the world of cybersecurity and privacy, and to promote the benefits of privacy overall. This is a **non-profit, community-driven** project that would not be possible without the generous support of all our [contributors](contributors.md). ## Donate @@ -10,7 +12,33 @@ Currently, the best way to support our work is to send a monthly or one-time con [:material-heart:{ .pg-red } Sponsor us on GitHub](https://github.com/sponsors/privacyguides){ class="md-button md-button--primary" } -We are also working with our fiscal host to receive cryptocurrency donations, at the moment the accounting is unfeasible for many smaller transactions, but this should change in the near future. In the meantime, if you still wish to make a cryptocurrency donation, please reach out to [jonah@privacyguides.org](mailto:jonah@privacyguides.org) to arrange a transaction. +A new donation platform we control to make donating easier will be deployed soon. In the meantime, if you'd like to arrange a donation (including with cryptocurrency), please reach out to [info@magicgrants.org](mailto:info@magicgrants.org). + +## How We Use Donations + +Privacy Guides is a **non-profit** organization. We use donations for a variety of purposes, including: + +**Web Hosting** + +: Traffic to this website uses hundreds of gigabytes of data per month, we use a variety of service providers to keep up with this traffic. + +**Domain Registrations** + +: We have a few domain names like `privacyguides.org` which cost us around $10 yearly to maintain their registration. + +**Online Services** + +: We host [internet services](services.md) for testing and showcasing different privacy-products we like and [recommend](../tools.md). Some of them are made publicly available for our community's use (SearXNG, Tor, etc.), and some are provided for our team members (email, etc.). + +**Product Purchases** + +: We occasionally purchase products and services for the purposes of testing our [recommended tools](../tools.md). + +Your donation will go to a [dedicated fund](https://magicgrants.org/funds/privacy_guides) within [MAGIC Grants](https://magicgrants.org), a 501(c)(3) organization. The funds will only be used for this project specifically. You may qualify for a tax deduction. If you need a donation receipt, please email . + +Thank you to all those who support our mission! :material-heart:{ .pg-red } + +We strictly **cannot** use donations to support political campaigns/candidates or attempt to influence legislation. Earnings also will **not** inure to the benefit of any private shareholder or individual. ## Merchandise @@ -18,26 +46,6 @@ Another option to support us is by buying our merchandise from HelloTux. We get [Buy on HelloTux.com](https://hellotux.com/privacyguides){ class="md-button" } -## How We Use Donations +## Non-Financial Support -Privacy Guides is a **non-profit** organization. We use donations for a variety of purposes, including: - -**Domain Registrations** - -: We have a few domain names like `privacyguides.org` which cost us around $10 yearly to maintain their registration. - -**Web Hosting** - -: Traffic to this website uses hundreds of gigabytes of data per month, we use a variety of service providers to keep up with this traffic. - -**Online Services** - -: We host [internet services](https://privacyguides.net) for testing and showcasing different privacy-products we like and [recommend](../tools.md). Some of which are made publicly available for our community's use (SearXNG, Tor, etc.), and some are provided for our team members (email, etc.). - -**Product Purchases** - -: We occasionally purchase products and services for the purposes of testing our [recommended tools](../tools.md). - -Your donation will go to a dedicated fund within [MAGIC Grants](https://magicgrants.org), a 501(c)(3) organization. The funds will only be used for this project specifically. You may qualify for a tax deduction. If you need a donation receipt, please email . - -Thank you to all those who support our mission! :material-heart:{ .pg-red } +It takes a lot of [people](contributors.md) and [work](https://github.com/privacyguides/privacyguides.org/pulse/monthly) to keep Privacy Guides up to date and spread the word about privacy and mass surveillance. If you're looking for other ways to help out, consider getting involved by [editing the site](https://github.com/privacyguides/privacyguides.org), [joining our forum](https://discuss.privacyguides.net), or [contributing translations](https://crowdin.com/project/privacyguides). diff --git a/docs/mobile-phones.md b/docs/mobile-phones.md index d8b4fa4a..b7bdc3e2 100644 --- a/docs/mobile-phones.md +++ b/docs/mobile-phones.md @@ -57,7 +57,7 @@ Google Pixel phones are the **only** devices we recommend for purchase. Pixel ph
-![Google Pixel 6](../assets/img/android/google-pixel.png){ align=right } +![Google Pixel 6](assets/img/android/google-pixel.png){ align=right } **Google Pixel** devices are known to have good security and properly support [Verified Boot](https://source.android.com/security/verifiedboot), even when installing custom operating systems. diff --git a/docs/tools.md b/docs/tools.md index 302efcd7..a4e82b77 100644 --- a/docs/tools.md +++ b/docs/tools.md @@ -468,7 +468,7 @@ For encrypting your operating system drive, we typically recommend using whichev
-- ![Google Pixel 6](../assets/img/android/google-pixel.png){ .twemoji loading=lazy } [Google Pixel](mobile-phones.md#google-pixel) +- ![Google Pixel 6](assets/img/android/google-pixel.png){ .twemoji loading=lazy } [Google Pixel](mobile-phones.md#google-pixel)
diff --git a/includes/contributors.md b/includes/contributors.md index 71b3229a..3025f46a 100644 --- a/includes/contributors.md +++ b/includes/contributors.md @@ -62,7 +62,7 @@
Gusted
πŸ“– -
redoomed1
πŸ“– πŸ‘€ +
redoomed1
πŸ‘€ πŸ“–
Offpics
πŸ“–
kimg45
πŸ“–
djoate
πŸ“– @@ -237,7 +237,7 @@
pdjpdjpdj
πŸ“– -
Stella Polaris
πŸ“– πŸ”¬ πŸ“£ πŸ’¬ +
Stella Polaris
πŸ“– πŸ”¬ πŸ“£ πŸ’¬ πŸ‘€
regaldude
πŸ“–
rusty-snake
πŸ“–
sacha
πŸ“– @@ -418,6 +418,20 @@
jx tsai
🌍
backstab5983
πŸ“– + +
antgig
πŸ“– +
Ákos NikhÑzy
πŸ“– +
Francois Marier
πŸ“– +
5-tom
πŸ“– +
Ralphie0511
πŸ“– + + +
aleksejs1
πŸ“– +
Martin
πŸ“– +
Overwatch
πŸ“– +
Kieran Colfer
πŸ“– +
Triple T
πŸ“– + diff --git a/mkdocs.yml b/mkdocs.yml index 28713fe3..5af7d010 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -269,6 +269,7 @@ theme: icon: repo: simple/github features: + - announce.dismiss - navigation.tracking - navigation.tabs - navigation.sections @@ -438,16 +439,16 @@ nav: - "alternative-networks.md" - "device-integrity.md" - !ENV [NAV_ABOUT, "About"]: - - "about/index.md" + - "about.md" + - "about/donate.md" - "about/contributors.md" - "about/criteria.md" - "about/notices.md" - "about/privacy-policy.md" - - "about/statistics.md" - !ENV [NAV_COMMUNITY, "Community"]: - - "about/donate.md" - !ENV [NAV_ONLINE_SERVICES, "Online Services"]: "about/services.md" - !ENV [NAV_CODE_OF_CONDUCT, "Code of Conduct"]: "CODE_OF_CONDUCT.md" + - "about/statistics.md" - "about/privacytools.md" - !ENV [NAV_CONTRIBUTING, "Contributing"]: - !ENV [NAV_WRITING_GUIDE, "Writing Guide"]: @@ -459,7 +460,7 @@ nav: - "meta/uploading-images.md" - "meta/git-recommendations.md" - "meta/commit-messages.md" - - !ENV [NAV_DONATE, "Donate"]: "about/donate/" + - "about/donate.md" - !ENV [NAV_CHANGELOG, "Changelog"]: "https://github.com/privacyguides/privacyguides.org/releases" - !ENV [NAV_FORUM, "Forum"]: "https://discuss.privacyguides.net/" diff --git a/modules/mkdocs-material b/modules/mkdocs-material index edd5029d..138ca9bc 160000 --- a/modules/mkdocs-material +++ b/modules/mkdocs-material @@ -1 +1 @@ -Subproject commit edd5029dd86077d595a3591faed6b21a73062bc8 +Subproject commit 138ca9bc876e97e180707427494e1c53b2e506df