From f9f4f3252cf6360c410069aa0190b7b308fecd46 Mon Sep 17 00:00:00 2001 From: Matt Beaudoin Date: Mon, 11 Aug 2025 16:33:37 -0700 Subject: [PATCH 1/4] change twitter references to x --- app/components/teams/team/member.hbs | 10 +++++----- app/index.html | 6 +++--- app/models/team-member.js | 2 +- app/templates/guidelines.hbs | 2 +- app/templates/head.hbs | 2 +- app/templates/mascots/faq.hbs | 4 ++-- app/templates/survey/2021.hbs | 6 +++--- app/templates/survey/2024.hbs | 6 +++--- .../team-member/files/data/team-member/__name__.md | 2 +- data/team-member/aaron-chambers.md | 2 +- data/team-member/alex-matchneer.md | 2 +- data/team-member/alex-navasardyan.md | 2 +- data/team-member/amy-lam.md | 2 +- data/team-member/anne-greeth-schot-van-herwijnen.md | 2 +- data/team-member/bert-de-block.md | 2 +- data/team-member/brendan-mc-loughlin.md | 2 +- data/team-member/chad-hietala.md | 2 +- data/team-member/chris-krycho.md | 2 +- data/team-member/chris-ng.md | 2 +- data/team-member/chris-thoburn.md | 2 +- data/team-member/christoffer-persson.md | 2 +- data/team-member/clemens-muller.md | 2 +- data/team-member/dan-freeman.md | 2 +- data/team-member/dan-gebhardt.md | 2 +- data/team-member/david-baker.md | 2 +- data/team-member/david-hamilton.md | 2 +- data/team-member/erik-bryn.md | 2 +- data/team-member/godfrey-chan.md | 2 +- data/team-member/ignace-maes.md | 2 +- data/team-member/igor-terzic.md | 2 +- data/team-member/isaac-lee.md | 2 +- data/team-member/jacob-bixby.md | 2 +- data/team-member/james-davis.md | 2 +- data/team-member/jared-galanis.md | 2 +- data/team-member/jen-weber.md | 2 +- data/team-member/jessica-jordan.md | 2 +- data/team-member/katie-gengler.md | 2 +- data/team-member/kelly-selden.md | 2 +- data/team-member/kenigbolo-meya-stephen.md | 2 +- data/team-member/kenneth-larsen.md | 2 +- data/team-member/kirill-shaplyko.md | 2 +- data/team-member/krati-ahuja.md | 2 +- data/team-member/kris-selden.md | 2 +- data/team-member/kristen-hewell-garrett.md | 2 +- data/team-member/krystan-huffmenne.md | 2 +- data/team-member/leah-silber.md | 2 +- data/team-member/martin-munoz.md | 2 +- data/team-member/matthew-beale.md | 2 +- data/team-member/melanie-sumner.md | 2 +- data/team-member/nathan-hammond.md | 2 +- data/team-member/peter-meehan.md | 2 +- data/team-member/ricardo-mendes.md | 2 +- data/team-member/rich-glazerman.md | 2 +- data/team-member/robbie-wagner.md | 2 +- data/team-member/robert-jackson.md | 2 +- data/team-member/scott-newcomer.md | 2 +- data/team-member/simon-ihmig.md | 2 +- data/team-member/sivakumar-kailasam.md | 2 +- data/team-member/stanley-stuart.md | 2 +- data/team-member/stefan-penner.md | 2 +- data/team-member/terence-lee.md | 2 +- data/team-member/tobias-bieniek.md | 2 +- data/team-member/todd-jordan.md | 2 +- data/team-member/tom-dale.md | 2 +- data/team-member/trek-glowacki.md | 2 +- data/team-member/yehuda-katz.md | 2 +- lib/content-data-generator/index.js | 2 +- tests/integration/components/teams/team/member-test.js | 6 +++--- 68 files changed, 81 insertions(+), 81 deletions(-) diff --git a/app/components/teams/team/member.hbs b/app/components/teams/team/member.hbs index 4598c7148..e03fd9933 100644 --- a/app/components/teams/team/member.hbs +++ b/app/components/teams/team/member.hbs @@ -28,16 +28,16 @@ {{/if}} - {{#if @member.twitter}} + {{#if @member.x}} - {{~! ~}}{{svg-jar "twitter"}}{{~! ~}} + {{~! ~}}{{svg-jar "x"}}{{~! ~}} {{/if}} diff --git a/app/index.html b/app/index.html index 666c2d09d..48949a048 100644 --- a/app/index.html +++ b/app/index.html @@ -7,10 +7,10 @@ - - + + - + {{content-for "head"}} diff --git a/app/models/team-member.js b/app/models/team-member.js index cf75670f9..8d619a932 100644 --- a/app/models/team-member.js +++ b/app/models/team-member.js @@ -11,5 +11,5 @@ export default class TeamMemberModel extends Model { @attr name; @attr social; @attr teams; - @attr twitter; + @attr x; } diff --git a/app/templates/guidelines.hbs b/app/templates/guidelines.hbs index 0b5e3591a..094bee332 100644 --- a/app/templates/guidelines.hbs +++ b/app/templates/guidelines.hbs @@ -97,7 +97,7 @@
  1. Mozilla Code of Conduct
  2. Ubuntu Code of Conduct
    3. -
  3. Twitter Code of Conduct
    4. +
  4. X Code of Conduct

You’ll note a lot of language that appears in all three.

diff --git a/app/templates/head.hbs b/app/templates/head.hbs index a8a10ef13..b1d61b76e 100644 --- a/app/templates/head.hbs +++ b/app/templates/head.hbs @@ -1,3 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/templates/mascots/faq.hbs b/app/templates/mascots/faq.hbs index 1caacd805..2d08d1aa6 100644 --- a/app/templates/mascots/faq.hbs +++ b/app/templates/mascots/faq.hbs @@ -4,7 +4,7 @@
  1. Can I use the Tomster for my product/website/company/etc.?
    2. -
  2. Can I use it for my avatar/Twitter photo/OKCupid headshot/etc?
    3. +
  3. Can I use it for my avatar/X photo/OKCupid headshot/etc?
  4. Can you make a Tomster that looks like [insert thing here]?
  5. Can I make my own Tomster?
  6. Can I modify the Tomster?
    7. @@ -18,7 +18,7 @@

    The Tomster is a registered trademark, and more importantly, a big part of our identity! He may not be used for any unofficial purposes without us granting a specific license.

    There are different processes whereby companies, community efforts and user groups can commission specific Tomsters and be granted license to use them. It’s affordable and easy, though we’re picky about approvals. To tell us more about your request, reach out.

    -

    Can I use it for my avatar/Twitter photo/
    OKCupid headshot/etc?

    +

    Can I use it for my avatar/X photo/
    OKCupid headshot/etc?

    See the previous question as well. Please do not use the Tomster for anything without specific permission. Besides: you’re lovely! And also (probably) not a hamster. You can find something better <3

    Can you make a Tomster that looks like [insert thing here]?

    diff --git a/app/templates/survey/2021.hbs b/app/templates/survey/2021.hbs index 5f2323b57..7e5d7ff2b 100644 --- a/app/templates/survey/2021.hbs +++ b/app/templates/survey/2021.hbs @@ -93,19 +93,19 @@
    {{!-- template-lint-disable "no-forbidden-elements" --}} - +

    diff --git a/app/templates/survey/2024.hbs b/app/templates/survey/2024.hbs index bcf90a4de..d04f6d27d 100644 --- a/app/templates/survey/2024.hbs +++ b/app/templates/survey/2024.hbs @@ -93,19 +93,19 @@

    {{!-- template-lint-disable "no-forbidden-elements" --}} - +

    diff --git a/blueprints/team-member/files/data/team-member/__name__.md b/blueprints/team-member/files/data/team-member/__name__.md index 40abdd800..81c337a52 100644 --- a/blueprints/team-member/files/data/team-member/__name__.md +++ b/blueprints/team-member/files/data/team-member/__name__.md @@ -6,7 +6,7 @@ bluesky: github: mastodon: social: -twitter: +x: image: added: <%= date %> teams: diff --git a/data/team-member/aaron-chambers.md b/data/team-member/aaron-chambers.md index a4ef61ae6..bf1041bee 100644 --- a/data/team-member/aaron-chambers.md +++ b/data/team-member/aaron-chambers.md @@ -3,7 +3,7 @@ name: Aaron Chambers first: Aaron last: Chambers github: 'https://github.com/achambers' -twitter: 'https://twitter.com/grandazz' +x: 'https://x.com/grandazz' image: achambers.jpg added: 2023-05-25T13:01:14.573Z teams: diff --git a/data/team-member/alex-matchneer.md b/data/team-member/alex-matchneer.md index 42952a28b..db42519dc 100644 --- a/data/team-member/alex-matchneer.md +++ b/data/team-member/alex-matchneer.md @@ -3,7 +3,7 @@ name: Alex Matchneer first: Alex last: Matchneer github: 'https://github.com/machty' -twitter: 'https://twitter.com/machty' +x: 'https://x.com/machty' image: amatchneer.jpg added: 2013-09-10T09:00:00.000Z teams: diff --git a/data/team-member/alex-navasardyan.md b/data/team-member/alex-navasardyan.md index 81a47942c..44871567e 100644 --- a/data/team-member/alex-navasardyan.md +++ b/data/team-member/alex-navasardyan.md @@ -3,7 +3,7 @@ name: Alex Navasardyan first: Alex last: Navasardyan github: 'https://github.com/twokul' -twitter: 'https://twitter.com/twokul' +x: 'https://x.com/twokul' image: anavasardyan.jpg added: 2018-03-16T09:00:00.000Z teams: diff --git a/data/team-member/amy-lam.md b/data/team-member/amy-lam.md index c743324ed..e6658ee69 100644 --- a/data/team-member/amy-lam.md +++ b/data/team-member/amy-lam.md @@ -3,7 +3,7 @@ name: Amy Lam first: Amy last: Lam github: 'https://github.com/amyrlam' -twitter: 'https://twitter.com/amyrlam' +x: 'https://x.com/amyrlam' image: alam.jpg added: 2018-10-20T09:00:00.000Z teams: diff --git a/data/team-member/anne-greeth-schot-van-herwijnen.md b/data/team-member/anne-greeth-schot-van-herwijnen.md index 3358cdbcb..3b1163440 100644 --- a/data/team-member/anne-greeth-schot-van-herwijnen.md +++ b/data/team-member/anne-greeth-schot-van-herwijnen.md @@ -3,7 +3,7 @@ name: Anne-Greeth Schot-van Herwijnen first: Anne-Greeth last: Schot-van Herwijnen github: 'https://github.com/minthamie' -twitter: 'https://twitter.com/agvanherwijnen' +x: 'https://x.com/agvanherwijnen' image: anne-greeth.jpeg added: 2022-04-15T09:01:00.000Z teams: diff --git a/data/team-member/bert-de-block.md b/data/team-member/bert-de-block.md index ec66aa9e6..8f06ce87d 100644 --- a/data/team-member/bert-de-block.md +++ b/data/team-member/bert-de-block.md @@ -3,7 +3,7 @@ name: Bert De Block first: Bert last: De Block github: 'https://github.com/bertdeblock' -twitter: +x: image: bdeblock.jpg added: 2022-05-02T18:41:57.703Z teams: diff --git a/data/team-member/brendan-mc-loughlin.md b/data/team-member/brendan-mc-loughlin.md index 8f92f191c..342881562 100644 --- a/data/team-member/brendan-mc-loughlin.md +++ b/data/team-member/brendan-mc-loughlin.md @@ -3,7 +3,7 @@ name: Brendan McLoughlin first: Brendan last: McLoughlin github: 'https://github.com/bmac' -twitter: 'https://twitter.com/BezoMaxo' +x: 'https://x.com/BezoMaxo' image: bmcloughlin.png added: 2016-04-14T09:00:00.000Z teams: diff --git a/data/team-member/chad-hietala.md b/data/team-member/chad-hietala.md index ec56eb71f..3d9461497 100644 --- a/data/team-member/chad-hietala.md +++ b/data/team-member/chad-hietala.md @@ -3,7 +3,7 @@ name: Chad Hietala first: Chad last: Hietala github: 'https://github.com/chadhietala' -twitter: 'https://twitter.com/chadhietala' +x: 'https://x.com/chadhietala' image: chietala.jpg added: 2016-04-14T09:04:00.000Z teams: diff --git a/data/team-member/chris-krycho.md b/data/team-member/chris-krycho.md index f48fdfa5e..b6c9e72b2 100644 --- a/data/team-member/chris-krycho.md +++ b/data/team-member/chris-krycho.md @@ -3,7 +3,7 @@ name: Chris Krycho first: Chris last: Krycho github: 'https://github.com/chriskrycho' -twitter: 'https://twitter.com/chriskrycho' +x: 'https://x.com/chriskrycho' image: ckrycho.jpg added: 2022-02-14T11:10:00.000Z teams: diff --git a/data/team-member/chris-ng.md b/data/team-member/chris-ng.md index aaf344196..ae0d7f254 100644 --- a/data/team-member/chris-ng.md +++ b/data/team-member/chris-ng.md @@ -3,7 +3,7 @@ name: Chris Ng first: Chris last: Ng github: 'https://github.com/chrisrng' -twitter: 'https://twitter.com/chrisrng' +x: 'https://x.com/chrisrng' image: chrisrng.jpg added: 2022-03-29T00:00:00.000Z teams: diff --git a/data/team-member/chris-thoburn.md b/data/team-member/chris-thoburn.md index b43dd9e94..108523eca 100644 --- a/data/team-member/chris-thoburn.md +++ b/data/team-member/chris-thoburn.md @@ -3,7 +3,7 @@ name: Chris Thoburn first: Chris last: Thoburn github: 'https://github.com/runspired' -twitter: 'https://twitter.com/runspired' +x: 'https://x.com/runspired' image: cthoburn.jpg added: 2019-01-01T09:00:00.000Z teams: diff --git a/data/team-member/christoffer-persson.md b/data/team-member/christoffer-persson.md index b04b6a42a..3bbaeab85 100644 --- a/data/team-member/christoffer-persson.md +++ b/data/team-member/christoffer-persson.md @@ -3,7 +3,7 @@ name: Christoffer Persson first: Christoffer last: Persson github: 'https://github.com/wecc' -twitter: 'https://twitter.com/ChristofferP' +x: 'https://x.com/ChristofferP' image: cpersson.jpg added: 2016-04-15T09:00:00.000Z teams: diff --git a/data/team-member/clemens-muller.md b/data/team-member/clemens-muller.md index 4dc7c1984..e64c11a3f 100644 --- a/data/team-member/clemens-muller.md +++ b/data/team-member/clemens-muller.md @@ -3,7 +3,7 @@ name: Clemens Müller first: Clemens last: Müller github: 'https://github.com/pangratz' -twitter: 'https://twitter.com/pangratz' +x: 'https://x.com/pangratz' image: cmueller.jpg added: 2016-04-15T09:01:00.000Z teams: diff --git a/data/team-member/dan-freeman.md b/data/team-member/dan-freeman.md index b94239944..539a707de 100644 --- a/data/team-member/dan-freeman.md +++ b/data/team-member/dan-freeman.md @@ -3,7 +3,7 @@ name: Dan Freeman first: Dan last: Freeman github: 'https://github.com/dfreeman' -twitter: 'https://twitter.com/__dfreeman' +x: 'https://x.com/__dfreeman' image: dfreeman.jpg added: 2022-03-09T18:25:00.000Z teams: diff --git a/data/team-member/dan-gebhardt.md b/data/team-member/dan-gebhardt.md index a01c034ca..f2007bac3 100644 --- a/data/team-member/dan-gebhardt.md +++ b/data/team-member/dan-gebhardt.md @@ -3,7 +3,7 @@ name: Dan Gebhardt first: Dan last: Gebhardt github: 'https://github.com/dgeb' -twitter: 'https://twitter.com/dgeb' +x: 'https://x.com/dgeb' image: dgeb.jpg added: 2016-04-15T09:00:00.000Z teams: diff --git a/data/team-member/david-baker.md b/data/team-member/david-baker.md index 5468bb8a6..e901b9740 100644 --- a/data/team-member/david-baker.md +++ b/data/team-member/david-baker.md @@ -3,7 +3,7 @@ name: David Baker first: David last: Baker github: 'https://github.com/acorncom' -twitter: 'https://twitter.com/acorncom' +x: 'https://x.com/acorncom' image: dbaker.jpg added: 2016-04-14T09:01:00.000Z teams: diff --git a/data/team-member/david-hamilton.md b/data/team-member/david-hamilton.md index 41535cc9d..a5fa069c6 100644 --- a/data/team-member/david-hamilton.md +++ b/data/team-member/david-hamilton.md @@ -3,7 +3,7 @@ name: David Hamilton first: David last: Hamilton github: 'https://github.com/hjdivad' -twitter: 'https://twitter.com/hjdivad' +x: 'https://x.com/hjdivad' image: dhamilton.jpg added: 2019-03-27T09:00:00.000Z teams: diff --git a/data/team-member/erik-bryn.md b/data/team-member/erik-bryn.md index 1ce354d1d..6df0fec50 100644 --- a/data/team-member/erik-bryn.md +++ b/data/team-member/erik-bryn.md @@ -3,7 +3,7 @@ name: Erik Bryn first: Erik last: Bryn github: 'https://github.com/ebryn' -twitter: 'https://twitter.com/ebryn' +x: 'https://x.com/ebryn' image: ebryn.jpg added: 2013-04-02T09:04:00.000Z teams: diff --git a/data/team-member/godfrey-chan.md b/data/team-member/godfrey-chan.md index aaf6992a8..d06dbd887 100644 --- a/data/team-member/godfrey-chan.md +++ b/data/team-member/godfrey-chan.md @@ -3,7 +3,7 @@ name: Godfrey Chan first: Godfrey last: Chan github: 'https://github.com/chancancode' -twitter: 'https://twitter.com/chancancode' +x: 'https://x.com/chancancode' image: godfrey.jpg added: 2016-07-12T09:00:00.000Z teams: diff --git a/data/team-member/ignace-maes.md b/data/team-member/ignace-maes.md index 7798633b7..b51db44cc 100644 --- a/data/team-member/ignace-maes.md +++ b/data/team-member/ignace-maes.md @@ -3,7 +3,7 @@ name: Ignace Maes first: Ignace last: Maes github: 'https://github.com/IgnaceMaes' -twitter: 'https://twitter.com/Ignace_Maes' +x: 'https://x.com/Ignace_Maes' image: ignacemaes.jpg added: 2024-02-01T17:01:20.842Z teams: diff --git a/data/team-member/igor-terzic.md b/data/team-member/igor-terzic.md index eae1090b2..70e34f578 100644 --- a/data/team-member/igor-terzic.md +++ b/data/team-member/igor-terzic.md @@ -3,7 +3,7 @@ name: Igor Terzic first: Igor last: Terzic github: 'https://github.com/igorT' -twitter: 'https://twitter.com/terzicigor' +x: 'https://x.com/terzicigor' image: iterzic.jpg added: 2014-12-09T09:00:00.000Z teams: diff --git a/data/team-member/isaac-lee.md b/data/team-member/isaac-lee.md index d8a0b9ff0..5bb68498d 100644 --- a/data/team-member/isaac-lee.md +++ b/data/team-member/isaac-lee.md @@ -3,7 +3,7 @@ name: Isaac Lee first: Isaac last: Lee github: 'https://github.com/ijlee2' -twitter: +x: image: ilee.jpg added: 2020-06-18T21:00:00.000Z teams: diff --git a/data/team-member/jacob-bixby.md b/data/team-member/jacob-bixby.md index 2cfdc46f4..31e320389 100644 --- a/data/team-member/jacob-bixby.md +++ b/data/team-member/jacob-bixby.md @@ -3,7 +3,7 @@ name: Jacob Bixby first: Jacob last: Bixby github: 'https://github.com/trabus' -twitter: 'https://twitter.com/trabus' +x: 'https://x.com/trabus' image: jbixby.jpg added: 2016-04-15T09:05:00.000Z teams: diff --git a/data/team-member/james-davis.md b/data/team-member/james-davis.md index 72a4e1ad6..f46ba841c 100644 --- a/data/team-member/james-davis.md +++ b/data/team-member/james-davis.md @@ -3,7 +3,7 @@ name: James Davis first: James last: Davis github: 'https://github.com/jamescdavis' -twitter: 'https://twitter.com/jamscdavis' +x: 'https://x.com/jamscdavis' image: jdavis.jpg added: 2022-03-09T18:25:00.000Z teams: diff --git a/data/team-member/jared-galanis.md b/data/team-member/jared-galanis.md index 2143f9889..68564e6ca 100644 --- a/data/team-member/jared-galanis.md +++ b/data/team-member/jared-galanis.md @@ -3,7 +3,7 @@ name: Jared Galanis first: Jared last: Galanis github: 'https://github.com/jaredgalanis' -twitter: 'https://twitter.com/jaredgalanis' +x: 'https://x.com/jaredgalanis' image: jgalanis.jpg added: 2020-06-18T21:00:00.000Z teams: diff --git a/data/team-member/jen-weber.md b/data/team-member/jen-weber.md index 8be98cf39..f7d6e65b1 100644 --- a/data/team-member/jen-weber.md +++ b/data/team-member/jen-weber.md @@ -3,7 +3,7 @@ name: Jen Weber first: Jen last: Weber github: 'https://github.com/jenweber' -twitter: 'https://twitter.com/jwwweber' +x: 'https://x.com/jwwweber' image: jweber.jpg added: 2017-09-24T09:00:00.000Z teams: diff --git a/data/team-member/jessica-jordan.md b/data/team-member/jessica-jordan.md index b05157833..a33c1ac8b 100644 --- a/data/team-member/jessica-jordan.md +++ b/data/team-member/jessica-jordan.md @@ -3,7 +3,7 @@ name: Jessica Jordan first: Jessica last: Jordan github: 'https://github.com/jayjayjpg' -twitter: 'https://twitter.com/jayjayjpg' +x: 'https://x.com/jayjayjpg' image: jjordan.jpg added: 2017-09-24T09:01:00.000Z teams: diff --git a/data/team-member/katie-gengler.md b/data/team-member/katie-gengler.md index f72061415..b96084246 100644 --- a/data/team-member/katie-gengler.md +++ b/data/team-member/katie-gengler.md @@ -3,7 +3,7 @@ name: Katie Gengler first: Katie last: Gengler github: 'https://github.com/kategengler' -twitter: 'https://twitter.com/katiegengler' +x: 'https://x.com/katiegengler' image: kgengler.jpg added: 2016-04-14T09:03:00.000Z teams: diff --git a/data/team-member/kelly-selden.md b/data/team-member/kelly-selden.md index 1692f4215..4f84190b2 100644 --- a/data/team-member/kelly-selden.md +++ b/data/team-member/kelly-selden.md @@ -3,7 +3,7 @@ name: Kelly Selden first: Kelly last: Selden github: 'https://github.com/kellyselden' -twitter: 'https://twitter.com/kellyselden' +x: 'https://x.com/kellyselden' image: kellyselden.jpg added: 2016-04-16T09:00:00.000Z teams: diff --git a/data/team-member/kenigbolo-meya-stephen.md b/data/team-member/kenigbolo-meya-stephen.md index 76593bf3e..237d06b1d 100644 --- a/data/team-member/kenigbolo-meya-stephen.md +++ b/data/team-member/kenigbolo-meya-stephen.md @@ -3,7 +3,7 @@ name: Kenigbolo Meya Stephen first: Kenigbolo last: Meya Stephen github: 'https://github.com/kenigbolo' -twitter: 'https://twitter.com/expensivestevie' +x: 'https://x.com/expensivestevie' image: kmstephen.jpg added: 2021-03-22T09:01:00.000Z teams: diff --git a/data/team-member/kenneth-larsen.md b/data/team-member/kenneth-larsen.md index 78ae3b338..aef7bb3e5 100644 --- a/data/team-member/kenneth-larsen.md +++ b/data/team-member/kenneth-larsen.md @@ -3,7 +3,7 @@ name: Kenneth Larsen first: Kenneth last: Larsen github: 'https://github.com/kennethlarsen' -twitter: 'https://twitter.com/kennethlarsen' +x: 'https://x.com/kennethlarsen' image: klarsen.jpg added: 2018-12-22T09:01:00.000Z teams: diff --git a/data/team-member/kirill-shaplyko.md b/data/team-member/kirill-shaplyko.md index 8634b26d2..73e17d27f 100644 --- a/data/team-member/kirill-shaplyko.md +++ b/data/team-member/kirill-shaplyko.md @@ -3,7 +3,7 @@ name: Kirill Shaplyko first: Kirill last: Shaplyko github: https://github.com/Baltazore -twitter: https://twitter.com/KirillShaplyko +x: https://x.com/KirillShaplyko image: kshaplyko.png added: 2024-05-19T19:10:29.058Z teams: diff --git a/data/team-member/krati-ahuja.md b/data/team-member/krati-ahuja.md index 65c804642..c7cfb3eaa 100644 --- a/data/team-member/krati-ahuja.md +++ b/data/team-member/krati-ahuja.md @@ -3,7 +3,7 @@ name: Krati Ahuja first: Krati last: Ahuja github: 'https://github.com/kratiahuja' -twitter: 'https://twitter.com/kratiahuja' +x: 'https://x.com/kratiahuja' image: kratiahuja.jpg added: 2017-05-26T09:00:00.000Z teams: diff --git a/data/team-member/kris-selden.md b/data/team-member/kris-selden.md index fd7110637..c3144087b 100644 --- a/data/team-member/kris-selden.md +++ b/data/team-member/kris-selden.md @@ -3,7 +3,7 @@ name: Kris Selden first: Kris last: Selden github: 'https://github.com/krisselden' -twitter: 'https://twitter.com/krisselden' +x: 'https://x.com/krisselden' image: kselden.jpg added: 2013-04-02T09:05:00.000Z teams: diff --git a/data/team-member/kristen-hewell-garrett.md b/data/team-member/kristen-hewell-garrett.md index 2d03fef27..0ae628215 100644 --- a/data/team-member/kristen-hewell-garrett.md +++ b/data/team-member/kristen-hewell-garrett.md @@ -3,7 +3,7 @@ name: Kristen Hewell Garrett first: Kristen last: Hewell Garrett github: 'https://github.com/pzuraq' -twitter: 'https://twitter.com/pzuraq' +x: 'https://x.com/pzuraq' image: khewellgarrett.png added: 2019-04-25T09:04:00.000Z teams: diff --git a/data/team-member/krystan-huffmenne.md b/data/team-member/krystan-huffmenne.md index 70fde74db..dd55f01ca 100644 --- a/data/team-member/krystan-huffmenne.md +++ b/data/team-member/krystan-huffmenne.md @@ -3,7 +3,7 @@ name: Krystan HuffMenne first: Krystan last: HuffMenne github: 'https://github.com/gitKrystan' -twitter: 'https://twitter.com/hm_krystan' +x: 'https://x.com/hm_krystan' image: khuffmenne.jpg added: 2023-05-19T00:00:00.000Z teams: diff --git a/data/team-member/leah-silber.md b/data/team-member/leah-silber.md index daca87cd7..4f4fad388 100644 --- a/data/team-member/leah-silber.md +++ b/data/team-member/leah-silber.md @@ -3,7 +3,7 @@ name: Leah Silber first: Leah last: Silber github: 'https://github.com/wifelette' -twitter: 'https://twitter.com/wifelette' +x: 'https://x.com/wifelette' image: lsilber.jpg added: 2013-04-02T09:07:00.000Z teams: diff --git a/data/team-member/martin-munoz.md b/data/team-member/martin-munoz.md index dc94a05cd..7662ac410 100644 --- a/data/team-member/martin-munoz.md +++ b/data/team-member/martin-munoz.md @@ -3,7 +3,7 @@ name: Martin Muñoz first: Martin last: Muñoz github: 'https://github.com/mmun' -twitter: 'https://twitter.com/_mmun' +x: 'https://x.com/_mmun' image: mmunoz.jpg added: 2015-06-23T09:00:00.000Z teams: diff --git a/data/team-member/matthew-beale.md b/data/team-member/matthew-beale.md index c2c363d9f..06e48da15 100644 --- a/data/team-member/matthew-beale.md +++ b/data/team-member/matthew-beale.md @@ -3,7 +3,7 @@ name: Matthew Beale first: Matthew last: Beale github: 'https://github.com/mixonic' -twitter: 'https://twitter.com/mixonic' +x: 'https://x.com/mixonic' image: mbeale.jpg added: 2015-04-08T09:00:00.000Z teams: diff --git a/data/team-member/melanie-sumner.md b/data/team-member/melanie-sumner.md index 418ee9aee..d22ee9caa 100644 --- a/data/team-member/melanie-sumner.md +++ b/data/team-member/melanie-sumner.md @@ -3,7 +3,7 @@ name: Melanie Sumner first: Melanie last: Sumner github: 'https://github.com/melsumner' -twitter: 'https://twitter.com/melaniersumner' +x: 'https://x.com/melaniersumner' image: msumner.jpg added: 2017-11-28T09:00:00.000Z teams: diff --git a/data/team-member/nathan-hammond.md b/data/team-member/nathan-hammond.md index 4a034f993..422fa65e2 100644 --- a/data/team-member/nathan-hammond.md +++ b/data/team-member/nathan-hammond.md @@ -3,7 +3,7 @@ name: Nathan Hammond first: Nathan last: Hammond github: 'https://github.com/nathanhammond' -twitter: 'https://twitter.com/nathanhammond' +x: 'https://x.com/nathanhammond' image: nhammond.jpg added: 2016-05-12T09:00:00.000Z teams: diff --git a/data/team-member/peter-meehan.md b/data/team-member/peter-meehan.md index 4f7a77607..8c3d4c31a 100644 --- a/data/team-member/peter-meehan.md +++ b/data/team-member/peter-meehan.md @@ -3,7 +3,7 @@ name: Peter Meehan first: Peter last: Meehan github: 'https://github.com/22a' -twitter: 'https://twitter.com/22a' +x: 'https://x.com/22a' image: pmeehan.jpg added: 2023-08-11T13:00:00Z teams: diff --git a/data/team-member/ricardo-mendes.md b/data/team-member/ricardo-mendes.md index 2ef681984..f7b62669f 100644 --- a/data/team-member/ricardo-mendes.md +++ b/data/team-member/ricardo-mendes.md @@ -3,7 +3,7 @@ name: Ricardo Mendes first: Ricardo last: Mendes github: 'https://github.com/locks' -twitter: 'https://twitter.com/locks' +x: 'https://x.com/locks' image: rmendes.jpg added: 2016-04-14T09:02:00.000Z teams: diff --git a/data/team-member/rich-glazerman.md b/data/team-member/rich-glazerman.md index ca71ee9cb..bf0230780 100644 --- a/data/team-member/rich-glazerman.md +++ b/data/team-member/rich-glazerman.md @@ -3,7 +3,7 @@ name: Rich Glazerman first: Rich last: Glazerman github: https://github.com/richgt -twitter: +x: image: rglazerman.png added: 2024-04-30T20:31:29.058Z teams: diff --git a/data/team-member/robbie-wagner.md b/data/team-member/robbie-wagner.md index 6cab23d05..9058c6d8d 100644 --- a/data/team-member/robbie-wagner.md +++ b/data/team-member/robbie-wagner.md @@ -3,7 +3,7 @@ name: Robbie Wagner first: Robbie last: Wagner github: 'https://github.com/RobbieTheWagner' -twitter: 'https://twitter.com/RobbieTheWagner' +x: 'https://x.com/RobbieTheWagner' image: rwagner.jpg added: 2019-06-03T21:46:40.434Z teams: diff --git a/data/team-member/robert-jackson.md b/data/team-member/robert-jackson.md index c775f718b..9b3bf4e9e 100644 --- a/data/team-member/robert-jackson.md +++ b/data/team-member/robert-jackson.md @@ -3,7 +3,7 @@ name: Robert Jackson first: Robert last: Jackson github: 'https://github.com/rwjblue' -twitter: 'https://twitter.com/rwjblue' +x: 'https://x.com/rwjblue' image: rjackson.jpg added: 2014-03-26T09:00:00.000Z teams: diff --git a/data/team-member/scott-newcomer.md b/data/team-member/scott-newcomer.md index c36b554b7..12cb08f50 100644 --- a/data/team-member/scott-newcomer.md +++ b/data/team-member/scott-newcomer.md @@ -3,7 +3,7 @@ name: Scott Newcomer first: Scott last: Newcomer github: 'https://github.com/snewcomer' -twitter: 'https://twitter.com/puekey' +x: 'https://x.com/puekey' image: snewcomer.jpg added: 2022-08-14T09:00:00.000Z teams: diff --git a/data/team-member/simon-ihmig.md b/data/team-member/simon-ihmig.md index dfe38049c..b1a38aa1f 100644 --- a/data/team-member/simon-ihmig.md +++ b/data/team-member/simon-ihmig.md @@ -3,7 +3,7 @@ name: Simon Ihmig first: Simon last: Ihmig github: 'https://github.com/simonihmig/' -twitter: 'https://twitter.com/simonihmig' +x: 'https://x.com/simonihmig' image: sihmig.jpeg added: 2023-07-01T16:50:00Z teams: diff --git a/data/team-member/sivakumar-kailasam.md b/data/team-member/sivakumar-kailasam.md index 13fd1e561..b82ed6ba3 100644 --- a/data/team-member/sivakumar-kailasam.md +++ b/data/team-member/sivakumar-kailasam.md @@ -3,7 +3,7 @@ name: Sivakumar Kailasam first: Sivakumar last: Kailasam github: 'https://github.com/sivakumar-kailasam' -twitter: 'https://twitter.com/sivakumar_k' +x: 'https://x.com/sivakumar_k' image: skailasam.jpg added: 2017-07-17T09:00:00.000Z teams: diff --git a/data/team-member/stanley-stuart.md b/data/team-member/stanley-stuart.md index 71ee11c3a..065d7ef8f 100644 --- a/data/team-member/stanley-stuart.md +++ b/data/team-member/stanley-stuart.md @@ -3,7 +3,7 @@ name: Stanley Stuart first: Stanley last: Stuart github: 'https://github.com/fivetanley' -twitter: 'https://twitter.com/fivetanley' +x: 'https://x.com/fivetanley' image: fivetanley.jpg added: 2016-04-15T09:02:00.000Z teams: diff --git a/data/team-member/stefan-penner.md b/data/team-member/stefan-penner.md index 1207b9876..2a9dd0bc3 100644 --- a/data/team-member/stefan-penner.md +++ b/data/team-member/stefan-penner.md @@ -3,7 +3,7 @@ name: Stefan Penner first: Stefan last: Penner github: 'https://github.com/stefanpenner' -twitter: 'https://twitter.com/stefanpenner' +x: 'https://x.com/stefanpenner' image: spenner.jpg added: 2013-04-02T09:06:00.000Z teams: diff --git a/data/team-member/terence-lee.md b/data/team-member/terence-lee.md index 8df2d5184..ee2ce62d0 100644 --- a/data/team-member/terence-lee.md +++ b/data/team-member/terence-lee.md @@ -3,7 +3,7 @@ name: Terence Lee first: Terence last: Lee github: 'https://github.com/hone' -twitter: 'https://twitter.com/hone02' +x: 'https://x.com/hone02' image: tlee.png added: 2017-07-17T09:01:00.000Z teams: diff --git a/data/team-member/tobias-bieniek.md b/data/team-member/tobias-bieniek.md index 55778c851..c72484329 100644 --- a/data/team-member/tobias-bieniek.md +++ b/data/team-member/tobias-bieniek.md @@ -3,7 +3,7 @@ name: Tobias Bieniek first: Tobias last: Bieniek github: 'https://github.com/Turbo87' -twitter: 'https://twitter.com/TobiasBieniek' +x: 'https://x.com/TobiasBieniek' image: tbieniek.jpg added: 2016-05-12T09:01:00.000Z teams: diff --git a/data/team-member/todd-jordan.md b/data/team-member/todd-jordan.md index 070e6ab72..9d6556615 100644 --- a/data/team-member/todd-jordan.md +++ b/data/team-member/todd-jordan.md @@ -3,7 +3,7 @@ name: Todd Jordan first: Todd last: Jordan github: 'https://github.com/toddjordan' -twitter: 'https://twitter.com/tddjordan' +x: 'https://x.com/tddjordan' image: tjordan.jpg added: 2016-04-14T09:05:00.000Z teams: diff --git a/data/team-member/tom-dale.md b/data/team-member/tom-dale.md index 68375fb38..e30f83137 100644 --- a/data/team-member/tom-dale.md +++ b/data/team-member/tom-dale.md @@ -3,7 +3,7 @@ name: Tom Dale first: Tom last: Dale github: 'https://github.com/tomdale' -twitter: 'https://twitter.com/tomdale' +x: 'https://x.com/tomdale' image: tdale.jpg added: 2013-04-02T09:01:00.000Z teams: diff --git a/data/team-member/trek-glowacki.md b/data/team-member/trek-glowacki.md index 7f4ec5b1a..f458cb4ab 100644 --- a/data/team-member/trek-glowacki.md +++ b/data/team-member/trek-glowacki.md @@ -3,7 +3,7 @@ name: Trek Glowacki first: Trek last: Glowack github: 'https://github.com/trek' -twitter: 'https://twitter.com/trek' +x: 'https://x.com/trek' image: tglowacki.jpg added: 2013-04-02T09:03:00.000Z teams: diff --git a/data/team-member/yehuda-katz.md b/data/team-member/yehuda-katz.md index e0a145c4a..33ca22833 100644 --- a/data/team-member/yehuda-katz.md +++ b/data/team-member/yehuda-katz.md @@ -3,7 +3,7 @@ name: Yehuda Katz first: Yehuda last: Katz github: 'https://github.com/wycats' -twitter: 'https://twitter.com/wycats' +x: 'https://x.com/wycats' image: ykatz.jpg added: 2013-04-02T09:00:00.000Z teams: diff --git a/lib/content-data-generator/index.js b/lib/content-data-generator/index.js index f8732629d..cfd9fcb97 100644 --- a/lib/content-data-generator/index.js +++ b/lib/content-data-generator/index.js @@ -31,7 +31,7 @@ const teamTree = new StaticSiteJson(`data/team-member`, { 'github', 'mastodon', 'social', - 'twitter', + 'x', 'image', 'teams', 'added', diff --git a/tests/integration/components/teams/team/member-test.js b/tests/integration/components/teams/team/member-test.js index 2dd77a355..3d1d829ed 100644 --- a/tests/integration/components/teams/team/member-test.js +++ b/tests/integration/components/teams/team/member-test.js @@ -35,11 +35,11 @@ module('Integration | Component | teams/team/member', function (hooks) { ); assert - .dom('[data-test-link="Twitter"]') + .dom('[data-test-link="X"]') .hasAttribute( 'href', - 'https://twitter.com/locks', - 'We see the correct URL for Twitter.' + 'https://x.com/locks', + 'We see the correct URL for X.' ); }); }); From 43d2aedc15bd042730e19308663fb54f88a6f520 Mon Sep 17 00:00:00 2001 From: Matt Beaudoin Date: Mon, 11 Aug 2025 16:40:44 -0700 Subject: [PATCH 2/4] update twitter code of conduct link --- app/templates/guidelines.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/guidelines.hbs b/app/templates/guidelines.hbs index 094bee332..c05264e57 100644 --- a/app/templates/guidelines.hbs +++ b/app/templates/guidelines.hbs @@ -97,7 +97,7 @@

    1. Mozilla Code of Conduct
    2. Ubuntu Code of Conduct
      3. -
    3. X Code of Conduct
      4. +
    4. X Code of Conduct

    You’ll note a lot of language that appears in all three.

    From 1ebf50a4ac947efec876c6ab60ff0652c0a721f9 Mon Sep 17 00:00:00 2001 From: Matt Beaudoin Date: Wed, 13 Aug 2025 20:57:09 -0700 Subject: [PATCH 3/4] add x svg --- public/images/icons/x.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 public/images/icons/x.svg diff --git a/public/images/icons/x.svg b/public/images/icons/x.svg new file mode 100644 index 000000000..ed69e855a --- /dev/null +++ b/public/images/icons/x.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file From 346c016fdf8eabcc42a5487df412d29d59b2478c Mon Sep 17 00:00:00 2001 From: Matt Beaudoin Date: Wed, 13 Aug 2025 20:58:13 -0700 Subject: [PATCH 4/4] format svg to other svg convention --- public/images/icons/x.svg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/images/icons/x.svg b/public/images/icons/x.svg index ed69e855a..c19657a23 100644 --- a/public/images/icons/x.svg +++ b/public/images/icons/x.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + \ No newline at end of file