July 2019 - tor-commits - lists.torproject.org

[tpo/master] Fix some typos and styling
by pili＠torproject.org 30 Jul '19

30 Jul '19

commit 3918950d16680bab005c1460d2c0fa893401dc1d Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 14:19:07 2019 +0100 Fix some typos and styling --- content/about/cy-pres/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/cy-pres/contents.lr b/content/about/cy-pres/contents.lr index f3891bb..6bc656f 100644 --- a/content/about/cy-pres/contents.lr +++ b/content/about/cy-pres/contents.lr @@ -30,11 +30,11 @@ Beyond developing technology, the organization helps people retain their privacy The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). -In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundatio's Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation's Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department – Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. #### Contact the Tor Project about a Cy Pres Award -If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. +If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at [sstevenson@torproject.org](mailto:sstevenson@torproject.org). #### Further Reading

1 0

[tpo/master] Add Cy Pres Awards page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 7314a78f97699a14188dbe6a2e52a8423a1e4ec7 Merge: 6fcaafc d5879b5 Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 12:00:50 2019 +0100 Add Cy Pres Awards page content/cy-pres/.gitkeep | 0 content/cy-pres/contents.lr | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)

1 0

[tpo/master] Add Cy Pres Awards Page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit bd34824c6bbc48871d9dc17d83c74ddfcc0dc21a Author: Pili Guerra <pili(a)torproject.org> Date: Fri Jul 26 13:54:11 2019 +0000 Add Cy Pres Awards Page --- content/cy-pres/contents.lr | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/content/cy-pres/contents.lr b/content/cy-pres/contents.lr new file mode 100644 index 0000000..094c08b --- /dev/null +++ b/content/cy-pres/contents.lr @@ -0,0 +1,43 @@ +section: home +--- +section_id: home +--- +color: dark +--- +_template: jumbotron.html +--- +title: Cy Pres Awards – Consumer Privacy and Privacy Online +--- +html: cy-pres.html +--- +body: + +## Cy Pres Awards – Consumer Privacy and Privacy Online + +_Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. + +### About the Tor Project + +The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: + +- Creating and deploying free and open anonymity and privacy technologies, +- Supporting their unrestricted availability and use, and +- Furthering their scientific and popular understanding. + +The Tor Project and its surrounding community develops and distributes some of the most popular and widely used free, open source privacy technologies: Tor Browser and the Tor network. + +Beyond developing technology, the organization helps people retain their privacy online. The Tor Project has educated thousands of activists, journalists, human rights defenders, librarians, consumers, and average internet users about how to protect and retain their privacy online. + +The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). + +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. + +### Contact the Tor Project about a Cy Pres Award + +If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. + +### Further Reading + +- [The Tor Project in the Media](https://www.torproject.org/press/) +- [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) +- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/) \ No newline at end of file

1 0

[tpo/master] Add Cy Pres Awards page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 6fcaafc660c72bec8e134152f6cc21a7dade1139 Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 11:59:39 2019 +0100 Add Cy Pres Awards page --- content/{ => about}/cy-pres/contents.lr | 24 ++++++++++++------------ templates/cy-pres.html | 7 +++++++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/content/cy-pres/contents.lr b/content/about/cy-pres/contents.lr similarity index 70% rename from content/cy-pres/contents.lr rename to content/about/cy-pres/contents.lr index 094c08b..f3891bb 100644 --- a/content/cy-pres/contents.lr +++ b/content/about/cy-pres/contents.lr @@ -1,24 +1,24 @@ -section: home +_template: about.html --- -section_id: home +section: About --- -color: dark +section_id: about --- -_template: jumbotron.html +html: cy-pres.html --- -title: Cy Pres Awards – Consumer Privacy and Privacy Online +color: primary --- -html: cy-pres.html +title: Cy Pres Awards --- body: -## Cy Pres Awards – Consumer Privacy and Privacy Online +### Cy Pres Awards – Consumer Privacy and Privacy Online _Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. -### About the Tor Project +#### About the Tor Project -The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: +The Tor Project is a U.S.-based 501(3) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: - Creating and deploying free and open anonymity and privacy technologies, - Supporting their unrestricted availability and use, and @@ -30,13 +30,13 @@ Beyond developing technology, the organization helps people retain their privacy The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). -In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundatio's Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. -### Contact the Tor Project about a Cy Pres Award +#### Contact the Tor Project about a Cy Pres Award If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. -### Further Reading +#### Further Reading - [The Tor Project in the Media](https://www.torproject.org/press/) - [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) diff --git a/templates/cy-pres.html b/templates/cy-pres.html new file mode 100644 index 0000000..36fa406 --- /dev/null +++ b/templates/cy-pres.html @@ -0,0 +1,7 @@ +<div class="container py-3 mt-5 content"> + <div class="col-sm-9"> + {% block body %} + {{ this.body }} + {% endblock %} + </div> +</div> \ No newline at end of file

1 0

[tpo/master] Add new directory for cy pres award page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 246a1d1d2a166686187fb1b3a6fd01aa7aaf1a08 Author: Pili Guerra <pili(a)torproject.org> Date: Fri Jul 26 13:50:55 2019 +0000 Add new directory for cy pres award page --- content/cy-pres/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/content/cy-pres/.gitkeep b/content/cy-pres/.gitkeep new file mode 100644 index 0000000..e69de29

1 0

[tpo/master] Add Cy Pres Awards Page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit d5879b528b2e27825f0a6972ad40e9d7d2ad4351 Author: Pili Guerra <pili(a)torproject.org> Date: Fri Jul 26 13:54:11 2019 +0000 Add Cy Pres Awards Page --- content/cy-pres/contents.lr | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/content/cy-pres/contents.lr b/content/cy-pres/contents.lr new file mode 100644 index 0000000..094c08b --- /dev/null +++ b/content/cy-pres/contents.lr @@ -0,0 +1,43 @@ +section: home +--- +section_id: home +--- +color: dark +--- +_template: jumbotron.html +--- +title: Cy Pres Awards – Consumer Privacy and Privacy Online +--- +html: cy-pres.html +--- +body: + +## Cy Pres Awards – Consumer Privacy and Privacy Online + +_Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. + +### About the Tor Project + +The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: + +- Creating and deploying free and open anonymity and privacy technologies, +- Supporting their unrestricted availability and use, and +- Furthering their scientific and popular understanding. + +The Tor Project and its surrounding community develops and distributes some of the most popular and widely used free, open source privacy technologies: Tor Browser and the Tor network. + +Beyond developing technology, the organization helps people retain their privacy online. The Tor Project has educated thousands of activists, journalists, human rights defenders, librarians, consumers, and average internet users about how to protect and retain their privacy online. + +The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). + +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. + +### Contact the Tor Project about a Cy Pres Award + +If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. + +### Further Reading + +- [The Tor Project in the Media](https://www.torproject.org/press/) +- [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) +- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/) \ No newline at end of file

1 0

[tpo/master] Delete old cy-pres directory
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 3bc5176d63819726c76a5cbf469992a6435e4fb6 Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 12:10:59 2019 +0100 Delete old cy-pres directory --- content/cy-pres/.gitkeep | 0 content/cy-pres/contents.lr | 43 ------------------------------------------- 2 files changed, 43 deletions(-) diff --git a/content/cy-pres/.gitkeep b/content/cy-pres/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/content/cy-pres/contents.lr b/content/cy-pres/contents.lr deleted file mode 100644 index 094c08b..0000000 --- a/content/cy-pres/contents.lr +++ /dev/null @@ -1,43 +0,0 @@ -section: home ---- -section_id: home ---- -color: dark ---- -_template: jumbotron.html ---- -title: Cy Pres Awards – Consumer Privacy and Privacy Online ---- -html: cy-pres.html ---- -body: - -## Cy Pres Awards – Consumer Privacy and Privacy Online - -_Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. - -### About the Tor Project - -The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: - -- Creating and deploying free and open anonymity and privacy technologies, -- Supporting their unrestricted availability and use, and -- Furthering their scientific and popular understanding. - -The Tor Project and its surrounding community develops and distributes some of the most popular and widely used free, open source privacy technologies: Tor Browser and the Tor network. - -Beyond developing technology, the organization helps people retain their privacy online. The Tor Project has educated thousands of activists, journalists, human rights defenders, librarians, consumers, and average internet users about how to protect and retain their privacy online. - -The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). - -In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. - -### Contact the Tor Project about a Cy Pres Award - -If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. - -### Further Reading - -- [The Tor Project in the Media](https://www.torproject.org/press/) -- [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) -- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/) \ No newline at end of file

1 0

[tpo/master] Merge branch 'master' of https://git.torproject.org/project/web/tpo
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit bcd7da91c73e55d11656320203353a1054aef180 Merge: 3bc5176 b0e53cc Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 12:11:31 2019 +0100 Merge branch 'master' of https://git.torproject.org/project/web/tpo content/about/people/acat/contents.lr | 2 +- content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/alsmith/contents.lr | 2 +- content/about/people/antonela/contents.lr | 2 +- content/about/people/atagar/contents.lr | 2 +- content/about/people/bdavila/contents.lr | 2 +- content/about/people/catalyst/contents.lr | 2 +- content/about/people/cindy-core/contents.lr | 2 +- content/about/people/cohosh/contents.lr | 2 +- content/about/people/emmapeel/contents.lr | 2 +- content/about/people/flexlibris/contents.lr | 2 +- content/about/people/gaba/contents.lr | 2 +- content/about/people/iangoldberg/contents.lr | 2 +- content/about/people/intrigeri/contents.lr | 2 +- content/about/people/irl/contents.lr | 2 +- content/about/people/karsten/contents.lr | 2 +- content/about/people/kat/contents.lr | 2 +- content/about/people/kushal/contents.lr | 2 +- content/about/people/ln5/contents.lr | 2 +- content/about/people/mcs/contents.lr | 2 +- content/about/people/nickm/contents.lr | 2 +- content/about/people/pili/contents.lr | 2 +- content/about/people/pospeselr/contents.lr | 2 +- content/about/people/sisbell/contents.lr | 2 +- content/about/people/sjmurdoch/contents.lr | 2 +- content/about/people/ssteele-core/contents.lr | 2 +- content/about/people/sstevenson/contents.lr | 2 +- content/about/people/stephw/contents.lr | 2 +- content/about/people/teor/contents.lr | 2 +- content/about/people/tjr/contents.lr | 2 +- content/about/people/wayward/contents.lr | 2 +- content/about/people/wseltzer/contents.lr | 2 +- templates/macros/people.html | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-)

1 0

[tpo/master] Add cy-pres page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 76501750c65b1598453a45b92fc6535c2f2b722e Author: hiro <hiro(a)torproject.org> Date: Tue Jul 30 13:58:03 2019 +0200 Add cy-pres page --- templates/about.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/about.html b/templates/about.html index 8a6552c..706617d 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,6 +12,10 @@ <div class="container py-3 mt-5 preamble"> {{ this.parent.body }} </div> + {% elif this.path == "/about/cy-pres" %} + <div class="container py-3 mt-5 preamble"> + {{ this.parent.body }} + </div> {% elif this.parent.path == "/about/jobs" %} <div class="container py-3 mt-5"> {{ this.summary }}

1 0

[tpo/master] Clean up pronoun display
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 2f229a3d483cc365445c2c2c50c20c772b73800b Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jun 19 22:04:42 2019 -0500 Clean up pronoun display Display pronoun links without the "https://" prefix on pronoun.is URLs. Modify the templates so that only the variable part of the pronoun URL is needed, e.g., "they" vs "https://pronoun.is/they". --- content/about/people/acat/contents.lr | 2 +- content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/alsmith/contents.lr | 2 +- content/about/people/antonela/contents.lr | 2 +- content/about/people/atagar/contents.lr | 2 +- content/about/people/bdavila/contents.lr | 2 +- content/about/people/catalyst/contents.lr | 2 +- content/about/people/cindy-core/contents.lr | 2 +- content/about/people/cohosh/contents.lr | 2 +- content/about/people/emmapeel/contents.lr | 2 +- content/about/people/flexlibris/contents.lr | 2 +- content/about/people/gaba/contents.lr | 2 +- content/about/people/iangoldberg/contents.lr | 2 +- content/about/people/intrigeri/contents.lr | 2 +- content/about/people/irl/contents.lr | 2 +- content/about/people/karsten/contents.lr | 2 +- content/about/people/kat/contents.lr | 2 +- content/about/people/kushal/contents.lr | 2 +- content/about/people/ln5/contents.lr | 2 +- content/about/people/mcs/contents.lr | 2 +- content/about/people/nickm/contents.lr | 2 +- content/about/people/pili/contents.lr | 2 +- content/about/people/pospeselr/contents.lr | 2 +- content/about/people/sisbell/contents.lr | 2 +- content/about/people/sjmurdoch/contents.lr | 2 +- content/about/people/ssteele-core/contents.lr | 2 +- content/about/people/sstevenson/contents.lr | 2 +- content/about/people/stephw/contents.lr | 2 +- content/about/people/teor/contents.lr | 2 +- content/about/people/tjr/contents.lr | 2 +- content/about/people/wayward/contents.lr | 2 +- content/about/people/wseltzer/contents.lr | 2 +- templates/macros/people.html | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/content/about/people/acat/contents.lr b/content/about/people/acat/contents.lr index 47a35df..ade319b 100644 --- a/content/about/people/acat/contents.lr +++ b/content/about/people/acat/contents.lr @@ -6,7 +6,7 @@ role: core --- name: Alex Catarineu --- -pronoun: https://pronoun.is/he +pronoun: he --- nickname: acat --- diff --git a/content/about/people/agrabeli/contents.lr b/content/about/people/agrabeli/contents.lr index 7de910d..57e7e75 100644 --- a/content/about/people/agrabeli/contents.lr +++ b/content/about/people/agrabeli/contents.lr @@ -8,7 +8,7 @@ name: Maria Xynou --- nickname: agrabeli --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: agrabeli_ --- diff --git a/content/about/people/ahf/contents.lr b/content/about/people/ahf/contents.lr index 57d27fe..d49d8ac 100644 --- a/content/about/people/ahf/contents.lr +++ b/content/about/people/ahf/contents.lr @@ -8,7 +8,7 @@ name: Alexander Færøy --- twitter_handle: ahfaeroey --- -pronoun: https://pronoun.is/he +pronoun: he --- nickname: ahf --- diff --git a/content/about/people/alsmith/contents.lr b/content/about/people/alsmith/contents.lr index 1a2ca7c..50624b6 100644 --- a/content/about/people/alsmith/contents.lr +++ b/content/about/people/alsmith/contents.lr @@ -12,7 +12,7 @@ gpg: /static/keys/alsmith.txt --- image: /static/images/people/alsmith.png --- -pronoun: https://pronoun.is/they +pronoun: they --- description: diff --git a/content/about/people/antonela/contents.lr b/content/about/people/antonela/contents.lr index 396a80f..22b058c 100644 --- a/content/about/people/antonela/contents.lr +++ b/content/about/people/antonela/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Antonela Debiasi --- -pronoun: https://pronoun.is/she +pronoun: she --- nickname: antonela --- diff --git a/content/about/people/atagar/contents.lr b/content/about/people/atagar/contents.lr index 563c88a..e416c59 100644 --- a/content/about/people/atagar/contents.lr +++ b/content/about/people/atagar/contents.lr @@ -8,7 +8,7 @@ name: Damian Johnson --- nickname: atagar --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD9… --- diff --git a/content/about/people/bdavila/contents.lr b/content/about/people/bdavila/contents.lr index 1163268..c41d0f6 100644 --- a/content/about/people/bdavila/contents.lr +++ b/content/about/people/bdavila/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Bekeela Davila --- -pronoun: https://pronoun.is/she +pronoun: she --- nickname: bdavila --- diff --git a/content/about/people/catalyst/contents.lr b/content/about/people/catalyst/contents.lr index e8e2412..47907da 100644 --- a/content/about/people/catalyst/contents.lr +++ b/content/about/people/catalyst/contents.lr @@ -10,7 +10,7 @@ nickname: catalyst --- twitter_handle: argonblue --- -pronoun: https://pronoun.is/they?or=she +pronoun: they?or=she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2C732B1C0DBEF678AB3AF606… --- diff --git a/content/about/people/cindy-core/contents.lr b/content/about/people/cindy-core/contents.lr index 898886e..4398526 100644 --- a/content/about/people/cindy-core/contents.lr +++ b/content/about/people/cindy-core/contents.lr @@ -8,7 +8,7 @@ name: Cindy Cohn --- nickname: cindy --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://www.eff.org/files/key_cindy.txt --- diff --git a/content/about/people/cohosh/contents.lr b/content/about/people/cohosh/contents.lr index 0c4f22b..781ec31 100644 --- a/content/about/people/cohosh/contents.lr +++ b/content/about/people/cohosh/contents.lr @@ -8,7 +8,7 @@ name: Cecylia --- nickname: cohosh --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=5A618CE840883942BAF1334F… --- diff --git a/content/about/people/emmapeel/contents.lr b/content/about/people/emmapeel/contents.lr index b5e529c..7e685b8 100644 --- a/content/about/people/emmapeel/contents.lr +++ b/content/about/people/emmapeel/contents.lr @@ -6,7 +6,7 @@ role:core --- name: emmapeel --- -pronoun: https://pronoun.is/she +pronoun: she --- nickname: emmapeel --- diff --git a/content/about/people/flexlibris/contents.lr b/content/about/people/flexlibris/contents.lr index d5948b7..6bc58b8 100644 --- a/content/about/people/flexlibris/contents.lr +++ b/content/about/people/flexlibris/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Alison Macrina --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: flexlibris --- diff --git a/content/about/people/gaba/contents.lr b/content/about/people/gaba/contents.lr index 2f994c9..63cf237 100644 --- a/content/about/people/gaba/contents.lr +++ b/content/about/people/gaba/contents.lr @@ -8,7 +8,7 @@ name: Gaba --- nickname: gaba --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://pgp.mit.edu/pks/lookup?op=vindex&search=0x180DB06C59CABD19 --- diff --git a/content/about/people/iangoldberg/contents.lr b/content/about/people/iangoldberg/contents.lr index d84812e..dab35ea 100644 --- a/content/about/people/iangoldberg/contents.lr +++ b/content/about/people/iangoldberg/contents.lr @@ -8,7 +8,7 @@ name: Ian Goldberg --- nickname: iang --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: /static/keys/ian.txt --- diff --git a/content/about/people/intrigeri/contents.lr b/content/about/people/intrigeri/contents.lr index 7199bde..1df6faa 100644 --- a/content/about/people/intrigeri/contents.lr +++ b/content/about/people/intrigeri/contents.lr @@ -8,7 +8,7 @@ name: intrigeri --- nickname: intrigeri --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://gaffer.ptitcanardnoir.org/intrigeri/contact/ --- diff --git a/content/about/people/irl/contents.lr b/content/about/people/irl/contents.lr index 7b4a908..7a750ff 100644 --- a/content/about/people/irl/contents.lr +++ b/content/about/people/irl/contents.lr @@ -10,7 +10,7 @@ nickname: irl --- twitter_handle: iainlearmonth --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=A8F7BA5041E133339CBA1696… --- diff --git a/content/about/people/karsten/contents.lr b/content/about/people/karsten/contents.lr index 37306f5..b08ef92 100644 --- a/content/about/people/karsten/contents.lr +++ b/content/about/people/karsten/contents.lr @@ -8,7 +8,7 @@ name: Karsten Loesing --- nickname: karsten --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=0CC8157C2578EEE92B0745D6… --- diff --git a/content/about/people/kat/contents.lr b/content/about/people/kat/contents.lr index 8fc4daa..e3eee28 100644 --- a/content/about/people/kat/contents.lr +++ b/content/about/people/kat/contents.lr @@ -8,7 +8,7 @@ name: Kat --- nickname: kat5 --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: /static/keys/kat.txt --- diff --git a/content/about/people/kushal/contents.lr b/content/about/people/kushal/contents.lr index fa408e3..16b53e9 100644 --- a/content/about/people/kushal/contents.lr +++ b/content/about/people/kushal/contents.lr @@ -8,7 +8,7 @@ name: Kushal Das --- nickname: kushal --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: kushaldas --- diff --git a/content/about/people/ln5/contents.lr b/content/about/people/ln5/contents.lr index 406192d..380bf7c 100644 --- a/content/about/people/ln5/contents.lr +++ b/content/about/people/ln5/contents.lr @@ -8,7 +8,7 @@ name: Linus Nordberg --- nickname: ln5 --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=8C4CD511095E982EB0EFBFA2… --- diff --git a/content/about/people/mcs/contents.lr b/content/about/people/mcs/contents.lr index c541ccc..86e94b6 100644 --- a/content/about/people/mcs/contents.lr +++ b/content/about/people/mcs/contents.lr @@ -8,7 +8,7 @@ name: Mark Smith --- nickname: mcs --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2602B0DD0EB238CCE037196A… --- diff --git a/content/about/people/nickm/contents.lr b/content/about/people/nickm/contents.lr index 4c2cf6d..a8f3955 100644 --- a/content/about/people/nickm/contents.lr +++ b/content/about/people/nickm/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Nick Mathewson --- -pronoun: https://pronoun.is/he +pronoun: he --- nickname: nickm --- diff --git a/content/about/people/pili/contents.lr b/content/about/people/pili/contents.lr index a692f38..9916b41 100644 --- a/content/about/people/pili/contents.lr +++ b/content/about/people/pili/contents.lr @@ -10,7 +10,7 @@ nickname: pili --- twitter_handle: mpguerra --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://pgp.mit.edu/pks/lookup?op=vindex&search=0xC6CB772EF0969C45 --- diff --git a/content/about/people/pospeselr/contents.lr b/content/about/people/pospeselr/contents.lr index 6cbb971..f3885a5 100644 --- a/content/about/people/pospeselr/contents.lr +++ b/content/about/people/pospeselr/contents.lr @@ -8,7 +8,7 @@ name: Richard Pospesel --- nickname: pospeselr --- -pronoun: https://pronoun.is/they/them +pronoun: they/them --- twitter_handle: pospeselr --- diff --git a/content/about/people/sisbell/contents.lr b/content/about/people/sisbell/contents.lr index 1280796..2f95fd9 100644 --- a/content/about/people/sisbell/contents.lr +++ b/content/about/people/sisbell/contents.lr @@ -8,7 +8,7 @@ name: Shane Isbell --- nickname: sisbell --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: sisbell --- diff --git a/content/about/people/sjmurdoch/contents.lr b/content/about/people/sjmurdoch/contents.lr index a3d3f0b..19da14a 100644 --- a/content/about/people/sjmurdoch/contents.lr +++ b/content/about/people/sjmurdoch/contents.lr @@ -8,7 +8,7 @@ name: Steven Murdoch --- nickname: sjmurdoch --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: sjmurdoch --- diff --git a/content/about/people/ssteele-core/contents.lr b/content/about/people/ssteele-core/contents.lr index 7a25552..09af9d2 100644 --- a/content/about/people/ssteele-core/contents.lr +++ b/content/about/people/ssteele-core/contents.lr @@ -8,7 +8,7 @@ name: Shari Steele --- nickname: ssteele --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: ssteele1234 --- diff --git a/content/about/people/sstevenson/contents.lr b/content/about/people/sstevenson/contents.lr index 978a0f8..3269de4 100644 --- a/content/about/people/sstevenson/contents.lr +++ b/content/about/people/sstevenson/contents.lr @@ -8,7 +8,7 @@ name: Sarah Stevenson --- nickname: sstevenson --- -pronoun: https://pronoun.is/she +pronoun: she --- image: /static/images/people/sstevenson.png --- diff --git a/content/about/people/stephw/contents.lr b/content/about/people/stephw/contents.lr index c907734..cae06da 100644 --- a/content/about/people/stephw/contents.lr +++ b/content/about/people/stephw/contents.lr @@ -8,7 +8,7 @@ name: Stephanie Whited --- nickname: stephw --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: walnutwordsalad --- diff --git a/content/about/people/teor/contents.lr b/content/about/people/teor/contents.lr index 06b2f9b..1d703e2 100644 --- a/content/about/people/teor/contents.lr +++ b/content/about/people/teor/contents.lr @@ -8,7 +8,7 @@ name: teor --- nickname: teor --- -pronoun: https://pronoun.is/they +pronoun: they --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43… --- diff --git a/content/about/people/tjr/contents.lr b/content/about/people/tjr/contents.lr index fb099d7..3fa1649 100644 --- a/content/about/people/tjr/contents.lr +++ b/content/about/people/tjr/contents.lr @@ -8,7 +8,7 @@ name: Tom Ritter --- nickname: tjr --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: tomrittervg --- diff --git a/content/about/people/wayward/contents.lr b/content/about/people/wayward/contents.lr index 10e860c..ff63ed0 100644 --- a/content/about/people/wayward/contents.lr +++ b/content/about/people/wayward/contents.lr @@ -8,7 +8,7 @@ name: Maggie Haughey --- nickname: wayward --- -pronoun: https://pronoun.is/she?or=they +pronoun: she?or=they --- twitter_handle: meochaidha --- diff --git a/content/about/people/wseltzer/contents.lr b/content/about/people/wseltzer/contents.lr index 85e6086..2922a6f 100644 --- a/content/about/people/wseltzer/contents.lr +++ b/content/about/people/wseltzer/contents.lr @@ -8,7 +8,7 @@ name: Wendy Seltzer --- nickname: wseltzer --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=4263006A4506740FAD871430… --- diff --git a/templates/macros/people.html b/templates/macros/people.html index 1d4be6e..79afc6f 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -38,7 +38,7 @@ <div class="card-body"> <h5 class="card-title human-name">{{ item.name }}</h5> {% if item.pronoun %} - <h6 class="nick text-primary m-0"><a href="{{ item.pronoun }}">{{ item.pronoun }}</a></h6> + <h6 class="nick text-primary m-0"><a href="https://pronoun.is/{{ item.pronoun }}">pronoun.is/{{ item.pronoun }}</a></h6> {% endif %} {% if item.nickname %} <label class="nick text-primary">IRC:{{ item.nickname }}</label>

1 0