GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit b0e53cce authored by Hiro's avatar Hiro 🏄

Merge remote-tracking branch 'catalyst/pronoun-display'

parents 75bdb445 2f229a3d
......@@ -6,7 +6,7 @@ role: core
---
name: Alex Catarineu
---
pronoun: https://pronoun.is/he
pronoun: he
---
nickname: acat
---
......
......@@ -8,7 +8,7 @@ name: Maria Xynou
---
nickname: agrabeli
---
pronoun: https://pronoun.is/she
pronoun: she
---
twitter_handle: agrabeli_
---
......
......@@ -8,7 +8,7 @@ name: Alexander Færøy
---
twitter_handle: ahfaeroey
---
pronoun: https://pronoun.is/he
pronoun: he
---
nickname: ahf
---
......
......@@ -12,7 +12,7 @@ gpg: /static/keys/alsmith.txt
---
image: /static/images/people/alsmith.png
---
pronoun: https://pronoun.is/they
pronoun: they
---
description:
......
......@@ -6,7 +6,7 @@ role:core
---
name: Antonela Debiasi
---
pronoun: https://pronoun.is/she
pronoun: she
---
nickname: antonela
---
......
......@@ -8,7 +8,7 @@ name: Damian Johnson
---
nickname: atagar
---
pronoun: https://pronoun.is/he
pronoun: he
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6
---
......
......@@ -6,7 +6,7 @@ role:core
---
name: Bekeela Davila
---
pronoun: https://pronoun.is/she
pronoun: she
---
nickname: bdavila
---
......
......@@ -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=2C732B1C0DBEF678AB3AF606A32F17FD0055C305
---
......
......@@ -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
---
......
......@@ -8,7 +8,7 @@ name: Cecylia
---
nickname: cohosh
---
pronoun: https://pronoun.is/she
pronoun: she
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=5A618CE840883942BAF1334F009DE379FD9B7B90
---
......
......@@ -6,7 +6,7 @@ role:core
---
name: emmapeel
---
pronoun: https://pronoun.is/she
pronoun: she
---
nickname: emmapeel
---
......
......@@ -6,7 +6,7 @@ role:core
---
name: Alison Macrina
---
pronoun: https://pronoun.is/she
pronoun: she
---
twitter_handle: flexlibris
---
......
......@@ -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
---
......
......@@ -8,7 +8,7 @@ name: Ian Goldberg
---
nickname: iang
---
pronoun: https://pronoun.is/he
pronoun: he
---
gpg: /static/keys/ian.txt
---
......
......@@ -8,7 +8,7 @@ name: intrigeri
---
nickname: intrigeri
---
pronoun: https://pronoun.is/he
pronoun: he
---
gpg: https://gaffer.ptitcanardnoir.org/intrigeri/contact/
---
......
......@@ -10,7 +10,7 @@ nickname: irl
---
twitter_handle: iainlearmonth
---
pronoun: https://pronoun.is/he
pronoun: he
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=A8F7BA5041E133339CBA169676D58093F540ABCD
---
......
......@@ -8,7 +8,7 @@ name: Karsten Loesing
---
nickname: karsten
---
pronoun: https://pronoun.is/he
pronoun: he
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=0CC8157C2578EEE92B0745D64EFD4FDC3F46D41E
---
......
......@@ -8,7 +8,7 @@ name: Kat
---
nickname: kat5
---
pronoun: https://pronoun.is/she
pronoun: she
---
gpg: /static/keys/kat.txt
---
......
......@@ -8,7 +8,7 @@ name: Kushal Das
---
nickname: kushal
---
pronoun: https://pronoun.is/he
pronoun: he
---
twitter_handle: kushaldas
---
......
......@@ -8,7 +8,7 @@ name: Linus Nordberg
---
nickname: ln5
---
pronoun: https://pronoun.is/he
pronoun: he
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=8C4CD511095E982EB0EFBFA21E8BF34923291265
---
......
......@@ -8,7 +8,7 @@ name: Mark Smith
---
nickname: mcs
---
pronoun: https://pronoun.is/he
pronoun: he
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2602B0DD0EB238CCE037196A0E36124F8E990F6E
---
......
......@@ -6,7 +6,7 @@ role:core
---
name: Nick Mathewson
---
pronoun: https://pronoun.is/he
pronoun: he
---
nickname: nickm
---
......
......@@ -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
---
......
......@@ -8,7 +8,7 @@ name: Richard Pospesel
---
nickname: pospeselr
---
pronoun: https://pronoun.is/they/them
pronoun: they/them
---
twitter_handle: pospeselr
---
......
......@@ -8,7 +8,7 @@ name: Shane Isbell
---
nickname: sisbell
---
pronoun: https://pronoun.is/he
pronoun: he
---
twitter_handle: sisbell
---
......
......@@ -8,7 +8,7 @@ name: Steven Murdoch
---
nickname: sjmurdoch
---
pronoun: https://pronoun.is/he
pronoun: he
---
twitter_handle: sjmurdoch
---
......
......@@ -8,7 +8,7 @@ name: Shari Steele
---
nickname: ssteele
---
pronoun: https://pronoun.is/she
pronoun: she
---
twitter_handle: ssteele1234
---
......
......@@ -8,7 +8,7 @@ name: Sarah Stevenson
---
nickname: sstevenson
---
pronoun: https://pronoun.is/she
pronoun: she
---
image: /static/images/people/sstevenson.png
---
......
......@@ -8,7 +8,7 @@ name: Stephanie Whited
---
nickname: stephw
---
pronoun: https://pronoun.is/she
pronoun: she
---
twitter_handle: walnutwordsalad
---
......
......@@ -8,7 +8,7 @@ name: teor
---
nickname: teor
---
pronoun: https://pronoun.is/they
pronoun: they
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43450CBA7F968F094B
---
......
......@@ -8,7 +8,7 @@ name: Tom Ritter
---
nickname: tjr
---
pronoun: https://pronoun.is/he
pronoun: he
---
twitter_handle: tomrittervg
---
......
......@@ -8,7 +8,7 @@ name: Maggie Haughey
---
nickname: wayward
---
pronoun: https://pronoun.is/she?or=they
pronoun: she?or=they
---
twitter_handle: meochaidha
---
......
......@@ -8,7 +8,7 @@ name: Wendy Seltzer
---
nickname: wseltzer
---
pronoun: https://pronoun.is/she
pronoun: she
---
gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=4263006A4506740FAD871430BAEBA2D7456CAD51
---
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment