Skip to content

update twitter references to x #1168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/components/teams/team/member.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
</a>
{{/if}}

{{#if @member.twitter}}
{{#if @member.x}}
<a
aria-label="{{@member.name}} Twitter"
aria-label="{{@member.name}} X"
class="icon"
data-test-link="Twitter"
href={{@member.twitter}}
data-test-link="X"
href={{@member.x}}
rel="noopener noreferrer"
target="_blank"
>
{{~! ~}}{{svg-jar "twitter"}}{{~! ~}}
{{~! ~}}{{svg-jar "x"}}{{~! ~}}
</a>
{{/if}}

Expand Down
6 changes: 3 additions & 3 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:description" content="Ember.js helps developers be more productive out of the box. Designed with developer ergonomics in mind, its friendly APIs help you get your job done—fast." />
<meta property="og:image" content="https://blog.emberjs.com/images/logos/e-icon.png" />
<meta name="twitter:card" content="summary" />
<meta name="twitter:site" content="@emberjs" />
<meta name="x:card" content="summary" />
<meta name="x:site" content="@emberjs" />
<meta name="google-site-verification" content="N9yOP2jCLcZBMHUet-JRqU2jnLVPeLDaePpkCqXGQXM" />
<meta name="twitter:image" content="https://blog.emberjs.com/images/logos/e-icon.png" />
<meta name="x:image" content="https://blog.emberjs.com/images/logos/e-icon.png" />

{{content-for "head"}}

Expand Down
2 changes: 1 addition & 1 deletion app/models/team-member.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export default class TeamMemberModel extends Model {
@attr name;
@attr social;
@attr teams;
@attr twitter;
@attr x;
}
2 changes: 1 addition & 1 deletion app/templates/guidelines.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<ol>
<li><a href="https://wiki.mozilla.org/Code_of_Conduct/Draft">Mozilla Code of Conduct</a></li>
<li><a href="http://www.ubuntu.com/about/about-ubuntu/conduct">Ubuntu Code of Conduct</a></li>
<li><a href="https://github.com/twitter/code-of-conduct">Twitter Code of Conduct</a></li>
<li><a href="https://github.com/twitter/.github/blob/main/code-of-conduct.md">X Code of Conduct</a></li>
</ol>

<p>You’ll note a lot of language that appears in all three.</p>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/head.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<meta property="st:title" content={{this.model.pageTitle}}>
<meta property="og:title" content={{this.model.pageTitle}}>
<meta name="twitter:title" content={{this.model.pageTitle}}>
<meta name="x:title" content={{this.model.pageTitle}}>
4 changes: 2 additions & 2 deletions app/templates/mascots/faq.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<ol>
<li><a href="#product">Can I use the Tomster for my product/website/company/etc.?</a></li>
<li><a href="#avatar">Can I use it for my avatar/Twitter photo/OKCupid headshot/etc?</a></li>
<li><a href="#avatar">Can I use it for my avatar/X photo/OKCupid headshot/etc?</a></li>
<li><a href="#make">Can you make a Tomster that looks like [insert thing here]?</a></li>
<li><a href="#own">Can I make my own Tomster?</a></li>
<li><a href="#modify">Can I modify the Tomster?</a></li>
Expand All @@ -18,7 +18,7 @@
<p>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.</p>
<p>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. <LinkTo @route="mascots.commission">To tell us more about your request, reach out</LinkTo>.</p>

<h2 id="avatar">Can I use it for my avatar/Twitter photo/<br>OKCupid headshot/etc?</h2>
<h2 id="avatar">Can I use it for my avatar/X photo/<br>OKCupid headshot/etc?</h2>
<p>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 &lt;3</p>

<h2 id="make">Can you make a Tomster that looks like [insert thing here]?</h2>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/survey/2021.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,19 @@

<div class="my-3">
<a
class="twitter-share-button"
class="x-share-button"
data-hashtags="EmberJS"
data-show-count="false"
data-size="large"
data-text="Do you use @emberjs? It&#39;s time for the 2021 survey!"
data-url="https://emberjs.com/survey/2021"
href="https://twitter.com/share?ref_src=twsrc%5Etfw"
href="https://x.com/share?ref_src=twsrc%5Etfw"
>
Tweet
</a>

{{!-- template-lint-disable "no-forbidden-elements" --}}
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
<script async src="https://platform.x.com/widgets.js" charset="utf-8"></script>
</div>

<p>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/survey/2024.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,19 @@

<div class="my-3">
<a
class="twitter-share-button"
class="x-share-button"
data-hashtags="EmberJS"
data-show-count="false"
data-size="large"
data-text="Do you use @emberjs? It&#39;s time for the 2024 survey!"
data-url="https://emberjs.com/survey/2024"
href="https://twitter.com/share?ref_src=twsrc%5Etfw"
href="https://x.com/share?ref_src=twsrc%5Etfw"
>
Tweet
</a>

{{!-- template-lint-disable "no-forbidden-elements" --}}
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
<script async src="https://platform.x.com/widgets.js" charset="utf-8"></script>
</div>

<p>
Expand Down
2 changes: 1 addition & 1 deletion blueprints/team-member/files/data/team-member/__name__.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bluesky:
github:
mastodon:
social:
twitter:
x:
image:
added: <%= date %>
teams:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/aaron-chambers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/alex-matchneer.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/alex-navasardyan.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/amy-lam.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/anne-greeth-schot-van-herwijnen.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/bert-de-block.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/brendan-mc-loughlin.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/chad-hietala.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/chris-krycho.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/chris-ng.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/chris-thoburn.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/christoffer-persson.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/clemens-muller.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/dan-freeman.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/dan-gebhardt.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/david-baker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/david-hamilton.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/erik-bryn.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/godfrey-chan.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/ignace-maes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/igor-terzic.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/isaac-lee.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/jacob-bixby.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/james-davis.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/jared-galanis.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/jen-weber.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/jessica-jordan.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/katie-gengler.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/team-member/kelly-selden.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading