diff --git a/community.html b/community.html index 0717bf79cbb77003d7792d53e9b57ea18888ce0b..7b544fce9b7cdcc237dd02274f422fd0d76db86b 100755 --- a/community.html +++ b/community.html @@ -175,15 +175,15 @@ <div class="row-fluid"> - <div class="span6"> + <div class="span6" id="events"> <h2 class="section-title"><i class="icon-calendar"></i> | Events</h2> <div class="event-list"> <div class="row-fluid"> <div class="span4 itembox"> - <h3>EclipseCon 2015</h3> - <p class="date">Mar 9-12, 2015</p> - <p class="location">Burlingame, CA</p> - <a href="http://www.eclipsecon.org/na2015" class="readmore">Read more <i class="icon-chevron-right"></i></a> + <h3>IoT Evolution</h3> + <p class="date">Jan 27-30, 2015</p> + <p class="location">Miami, FL</p> + <a href="http://www.iotevolutionexpo.com/" class="readmore">Read more <i class="icon-chevron-right"></i></a> </div> <div class="span4 itembox"> <h3>JFokus</h3> @@ -191,12 +191,60 @@ <p class="location">Stockholm, Sweden</p> <a href="http://www.jfokus.se/jfokus/" class="readmore">Read more <i class="icon-chevron-right"></i></a> </div> + <div class="span4 itembox"> + <h3>EclipseCon 2015</h3> + <p class="date">Mar 9-12, 2015</p> + <p class="location">Burlingame, CA</p> + <a href="http://www.eclipsecon.org/na2015" class="readmore">Read more <i class="icon-chevron-right"></i></a> + </div> + </div> + <div class="row-fluid"> + <div class="span4 itembox"> + <h3>Eclipse Day Dresden</h3> + <p class="date">Mar 18, 2015</p> + <p class="location">Dresden, Germany</p> + <a href="http://iotday.dd-eclipse.de/" class="readmore">Read more <i class="icon-chevron-right"></i></a> + </div> <div class="span4 itembox"> <h3>IoT Conference - Spring</h3> <p class="date">Mar 23-26, 2015</p> <p class="location">Munich, Germany</p> <a href="http://iotcon.de/2015se/" class="readmore">Read more <i class="icon-chevron-right"></i></a> </div> + <div class="span4 itembox"> + <h3>IoT DevCon</h3> + <p class="date">May 6-7, 2015</p> + <p class="location">Santa Clara, CA</p> + <a href="http://www.iot-devcon.com/" class="readmore">Read more <i class="icon-chevron-right"></i></a> + </div> + </div> + <div class="row-fluid"> + <div class="span4 itembox"> + <h3>IoT World</h3> + <p class="date">May 12-13, 2015</p> + <p class="location">San Francisco, CA</p> + <a href="http://iotworldevent.com/" class="readmore">Read more <i class="icon-chevron-right"></i></a> + </div> + <div class="span4 itembox"> + <h3>O'Reilly SOLID</h3> + <p class="date">June 23-25, 2015</p> + <p class="location">San Francisco, CA</p> + <a href="http://solidcon.com/solid2015" class="readmore">Read more <i class="icon-chevron-right"></i></a> + </div> + <div class="span4 itembox"> + <h3>EclipseCon France</h3> + <p class="date">June 24-26, 2015</p> + <p class="location">Toulouse, France</p> + <a href="https://www.eclipsecon.org/france2014/" class="readmore">Read more <i class="icon-chevron-right"></i></a> + </div> + </div> + <div class="row-fluid"> + <div class="span4 itembox"> + <h3>Industry of Things</h3> + <p class="date">Sept 21-22, 2015</p> + <p class="location">Berlin, Germany</p> + <a href="http://www.industryofthingsworld.com/en/" class="readmore">Read more <i class="icon-chevron-right"></i></a> + </div> </div> <!-- <div class="row-fluid"> </div> --> diff --git a/ecosystem.html b/ecosystem.html index 215345f49aefc266c7fb4b61fb2192018663af70..100d6c140f66c6484c7adb8c9b8f15fc402e5377 100755 --- a/ecosystem.html +++ b/ecosystem.html @@ -238,27 +238,6 @@ </div> </div> - <!-- Axeda --> - <div class="row members-info" id="member-axeda"> - <div class="span4 mb-logo"> - <a href="#"> - <img src="images/ecosystem/logo-axeda.png" alt="Axeda" /> - </a> - </div> - <div class="span8 mb-info"> - <div class="mb-info-container"> - <h4>Axeda</h4> - <p>Axeda provides the most advanced cloud-based service and software for managing connected products and machines and implementing innovative Machine-to-Machine (M2M) and Internet of Things (IoT) applications. Our customers use the Axeda Machine Cloud™ to turn machine data into valuable information, to build and run innovative M2M and IoT applications, and to optimize business processes by integrating machine data.</p> - </div> - <ul class="mb-links clearfix"> - <li class="read-more"><a href="http://www.axeda.com" target="_blank">Read more <i class="icon-chevron-right"></i></a> - </li> - <li><a href="https://www.youtube.com/watch?v=VVS-4iWvqhE" target="_blank">View Demo <i class="icon-eye-open"></i></a> - </li> - </ul> - </div> - </div> - <!-- Bitreactive --> <div class="row members-info" id="member-bitreactive"> <div class="span4 mb-logo"> diff --git a/index.html b/index.html index 93293986d85b11de92397f10733d6badd5f8e00f..cc8fccaadfe61f359e9bbb8036fe1078d6c807c6 100644 --- a/index.html +++ b/index.html @@ -243,17 +243,14 @@ These technologies aim at establishing an open, end-to-end, IoT stack."> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=652"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=652&size=small" style="padding:5px;" alt="Actuate"></a></small> </td> - <td> - <small><a href="#"><img width="120" src="./images/ecosystem/logo-axeda.png" style="padding:5px;" alt="Axeda"></a></small> - </td> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1103"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=1103&size=small" style="padding:5px;" alt="Bitreactive"></a></small> </td> - </tr> - <tr style="text-align:center;"> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=979"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=979&size=small" style="padding:5px;" alt="Robert Bosch GmbH"></a></small> </td> + </tr> + <tr style="text-align:center;"> <td> <small><a href="#"><img width="120" src="./images/ecosystem/logo-canonical.png" style="padding:5px;" alt="Canonical Group Ltd."></a></small> </td> @@ -263,11 +260,11 @@ These technologies aim at establishing an open, end-to-end, IoT stack."> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1122"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=1122&size=small" style="padding:5px;" alt="dc-square GmbH"></a></small> </td> - </tr> - <tr> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1139"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=1139&size=small" style="padding:5px;" alt="Deutsche Telekom AG"></a></small> </td> + </tr> + <tr> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1152"><img width="100" src="http://eclipse.org/membership/scripts/get_image.php?id=1152&size=small" style="padding:5px;" alt="GadgetKeeper"></a></small> </td> @@ -277,11 +274,11 @@ These technologies aim at establishing an open, end-to-end, IoT stack."> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1128"><img width="100" src="http://eclipse.org/membership/scripts/get_image.php?id=1128&size=small" style="padding:5px;" alt="IIC"></a></small> </td> - </tr> - <tr> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1140"><img width="100" src="http://eclipse.org/membership/scripts/get_image.php?id=1140&size=small" style="padding:5px;" alt="IS2T"></a></small> </td> + </tr> + <tr> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=817"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=817&size=small" style="padding:5px;" alt="itemis"></a></small> </td> @@ -291,11 +288,11 @@ These technologies aim at establishing an open, end-to-end, IoT stack."> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1151"><img width="120" src="./images/ecosystem/logo-litmus.png" style="padding:5px;" alt="Litmus Automation"></a></small> </td> - </tr> - <tr> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1101"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=1101&size=small" style="padding:5px;" alt="M2M Alliance"></a></small> </td> + </tr> + <tr> <td> <small><a href="http://eclipse.org/membership/showMember.php?member_id=1120"><img width="120" src="http://eclipse.org/membership/scripts/get_image.php?id=1120&size=small" style="padding:5px;" alt="openHAB UG"></a></small> </td> @@ -323,8 +320,7 @@ These technologies aim at establishing an open, end-to-end, IoT stack."> </li> <li><a href="contact.html" data-toggle="modal" data-target="#contact-modal">Contact Us</a> </li> - <li class="pull-right">Copyright © 2015 - The Eclipse Foundation. All Rights Reserved.</li> + <li class="pull-right">Copyright © 2015 The Eclipse Foundation. All Rights Reserved.</li> </ul> </footer> diff --git a/java/index.html b/java/index.html index 77312b4271aa37601abfd720141b9b34f11d68b4..f880596ae5193fd0c5bb46e5ca2beea16b18cfd4 100644 --- a/java/index.html +++ b/java/index.html @@ -206,7 +206,6 @@ <div class="span10 offset1" id="members"> <img src="/images/ecosystem/logo-2lemetry.png" width="120"> <img src="/images/ecosystem/logo-actuate.png" width="120"> - <img src="/images/ecosystem/logo-axeda.png" width="120"> <img src="/images/ecosystem/logo-dtag.png" width="120"> <img src="/images/ecosystem/logo-bitreactive.png" width="120"> <img src="/images/ecosystem/logo-dcsquare.png" width="120"> diff --git a/open-iot-challenge/index.html b/open-iot-challenge/index.html index b11656cc825f700ea7c4650833e808f5e36994cf..1aac094d4bff221775ce5120a6aec2c1e09606cb 100644 --- a/open-iot-challenge/index.html +++ b/open-iot-challenge/index.html @@ -214,8 +214,8 @@ </p> </div> <div class="span6"> - <p>Applications for the developer challenge are open now and will close <strong>January 17, 2015</strong>. To apply please complete the <a href="https://docs.google.com/forms/d/12ZCLK2p3Z-D49B3z47wIcp0KeyJ9BAN-oPlM6kqX4dY/viewform" target="_blank">following form</a>.</p> - <p>We will select up to 10 challengers that will receive a <strong>$150 gift card</strong> to help buy the hardware parts needed for the solution.</p> + <p>Applications for the developer challenge are now closed.</p> + <p>10 lucky challengers have received a <strong>$150 gift card</strong> to help buy the hardware parts needed for the solution, and there are 45 projects in total who entered the competition!</p> <p>Submissions of the final solution must be completed by <strong>February 27, 2015</strong>. Ten finalists will be selected to present their solution at EclipseCon 2015 or online via a webinar. Prizes will be awarded for the top 3 solutions.</p> <a href="https://docs.google.com/forms/d/12ZCLK2p3Z-D49B3z47wIcp0KeyJ9BAN-oPlM6kqX4dY/viewform"> <button>APPLY NOW</button> diff --git a/sandbox.html b/sandbox.html index ac9c2a4b623d6aefb0b0f188b79098e495edf55b..d5280ac312a0d29e9e59482be8c0788da69372d1 100644 --- a/sandbox.html +++ b/sandbox.html @@ -176,8 +176,8 @@ </p> <p> - The LWM2M server is available at: <code>coap://iot.eclipse.org:5684/</code> - <br> A web interface allows to interact with registered LWM2M clients: <a href="http://iot.eclipse.org/lwm2m/"><code>http://iot.eclipse.org/lwm2m/</code></a>. + The LWM2M server is available at: <code>coap://leshan.eclipse.org:5683</code> (both IPv4 and IPv6 are available) + <br> A web interface allows to interact with registered LWM2M clients: <a href="http://leshan.eclipse.org/"><code>http://leshan.eclipse.org</code></a>. </p> <p> This server is running the Open Source <a href="http:///github.com/jvermillard/leshan">Leshan server</a>.