Skip to content
This repository was archived by the owner on Mar 22, 2019. It is now read-only.

Commit 337e654

Browse files
authored
Merge pull request #2694 from emberjs/mascot-updates
Added new mascots, started fixing file naming
2 parents e90a521 + d96314a commit 337e654

File tree

8 files changed

+20
-4
lines changed

8 files changed

+20
-4
lines changed

data/tomsters.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
image: /images/tomsters/construction.png
7777
- title: EmberCamp Tomster
7878
url:
79-
date: December 21, 2012
79+
date: February 15, 2013
8080
image: /images/tomsters/embercamp.png
8181
- title: Fishy Tomster
8282
url: http://emberjs.com/community/
@@ -93,11 +93,11 @@
9393
- title: EmberConf 2015
9494
url: http://www.emberconf.com
9595
date: November 17, 2014
96-
image: /images/tomsters/kayaking.png
96+
image: /images/tomsters/emberconf-2015-tomster.png
9797
- title: EmberConf 2014
9898
url: http://www.emberconf.com
9999
date: November 1, 2013
100-
image: /images/tomsters/hanggliding.png
100+
image: /images/tomsters/emberconf-2014-tomster.png
101101
- title: Teaching Tomster
102102
url:
103103
date: January 14, 2013
@@ -166,3 +166,19 @@
166166
date: March 8, 2016
167167
url: http://triangleember.com/
168168
image: /images/tomsters/raleigh.png
169+
- title: DC Tomster
170+
date: August 29, 2016
171+
url: http://www.meetup.com/Ember-JS-DC/
172+
image: /images/tomsters/dc-tomster.png
173+
- title: Austin Zoey
174+
date: July 8, 2016
175+
url: http://www.meetup.com/Ember-ATX/
176+
image: /images/tomsters/austin-zoey.png
177+
- title: Munich Zoey
178+
date: July 19, 2016
179+
url: http://www.meetup.com/Ember-js-Munich/
180+
image: /images/tomsters/munich-zoey.png
181+
- title: EmberConf 2016
182+
date: March 28, 2016
183+
url: http://2016.emberconf.com/
184+
image: /images/tomsters/emberconf-2016-tomster.png
81.6 KB
Loading
51.5 KB
Loading
File renamed without changes.
File renamed without changes.
86.5 KB
Loading
73.7 KB
Loading

source/tomster.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: "Tomster and Zoey"
88
Tomster was the first of many friendly faces of the Ember project and community. Over the years we've dressed and redressed him for all sorts of fun projects and reasons. With the addition of his sister Zoey, you'll see Ember friends around even more.
99
<p>
1010
<p>
11-
Tomster is a registered and protected trademark. These images may not be used without specific and explicit consent (which we aim never to hold back unreasonably). If you have questions about using or commissioning a Tomster, <a href="/tomster/faq">check out the FAQ</a>.
11+
Tomster is a registered and protected trademark. These images may not be used without specific and explicit consent (which we aim never to hold back unreasonably). If you have questions about using or commissioning a custom Mascot, <a href="/tomster/faq">check out the FAQ</a>.
1212
</p>
1313
</div>
1414

0 commit comments

Comments
 (0)