Skip to content

Commit

Permalink
adding jetbrains and infragistics
Browse files Browse the repository at this point in the history
  • Loading branch information
Glenn Block committed Sep 12, 2012
1 parent d4d20e7 commit 16c26b5
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion schedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ exports.talks = [
"date" : new Date("2012-09-15T13:00:00Z"),
"duration" : 30,
"speaker" : {
"name" : "Makara Wang and Ronan Burder",
"name" : "Makara Wang and Ronan Berder",
"url" : "http://github.com/makara",
"image" : "ronan_makara.png",
"blurb" : "Makara is CTO@<a href='http://www.wiredcraf.com'>Wiredcraft</a>. Ronan is Founder / Managing Director of Wirdecraft. Both are passionate about OSS",
Expand Down
14 changes: 14 additions & 0 deletions sponsors.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@ exports.sponsors = [
"blurb": "Leading Intellectual Service and Innovation Platform",
"description": "Our vision: to provide world-class enterprise customers, the intellectual resources of the way of the Internet platform and overall service, enhance the twinkling of an eye the opportunity to grasp the key competencies, organizational flexibility and risk response."
},
{
"name": "Infragistics",
"url": "http://www.infragistics.com/",
"image": "infragistics.jpg",
"blurb": "Design. Develop. Experience",
"description": "Infragistics is a global software company whose products and services enable users to deliver awesome user experiences. Focusing on high performance grids and data visualization, our toolsets empower developers to create their best applications no matter what platform."
},
{
"name": "JetBrains",
"url": "http://jetbrains.com",
"image": "jetbrains.jpg",
"blurb": "Develop with Pleasure!",
"description": "At JetBrains, we have a passion for making people more productive through smart software solutions that help them focus more on what they really want to accomplish, and less on mundane, repetitive 'computer busy work'"
},
{
"name": "Turing Book Company",
"url": "http://ituring.com.cn",
Expand Down
2 changes: 1 addition & 1 deletion views/info.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<li>Full day hackathon on 9/16</li>
<li>Lunch and beverages for all 3 days</li>
<li>Opportunity to win special prizes</li>
<li><b>Attendance to the party hosted by <a href='http://www.factual.com'>Factual</a>. Click <a href='http://factualnodeparty.eventbrite.com'>here</a> to RSVP (only conf attendees can attend)</b></li>
<li><b>Attendance to the party hosted by <a href='http://www.factual.com'>Factual</a>.</b></li>
</ul>
<a href="http://www.headin.cn/Themes/Activity/Details?activityId=5038448b869d081bf0d972b3" class="subbutton">Purchase Tickets</a>
</div>
Expand Down

0 comments on commit 16c26b5

Please sign in to comment.