# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1350381610 -7200
# Node ID a7b8011c91dd93dbb4c034cf7c5f7bd741cbb1f3
# Parent  78ba6e14f1598d91d228afa1a43b6887e54464e5# Parent  03f55ccec9688be3e38ff2518476064303328d29
Merge with 483b159a5844c1e10f05fc701c8c079894b4ea76

diff -r 78ba6e14f159 -r a7b8011c91dd web/caps2012/config.php
--- a/web/caps2012/config.php	Tue Oct 16 10:03:17 2012 +0200
+++ b/web/caps2012/config.php	Tue Oct 16 12:00:10 2012 +0200
@@ -42,31 +42,50 @@
 <p>Please send pitches (1-3 slides) to <a href=\"mailto:hhalpin@w3.org\">hhalpin@w3.org</a> and <a href=\"mailto:kat@voxe.org\">kat@voxe.org</a> by October 11th.</p>
 <p>Presentations by:</p>
 <ul>
-<li>Frédéric Chomé &#8211; Factor-X</li>
-<li>Marc-Arthur Gauthey &#8211; Cup of Teach</li>
-<li>Frédéric Mazzella &#8211; Blablacar</li>
-<li>Edgeryders</li>
-<li>Benjamin Augros – pretachanger</li>
-<li>Anne-Alice Fievet &#8211; makesense</li>
-<li>Edouard Schlumberger, Voxe.org</li>
-<li>Benjamin des Gachons &#8211; Change.org</li>
-<li>Antonin Léonard &#8211; Ouishare</li>
-<li>La Ruche qui dit Oui</li>
-<li>Ruxandra Creosteanu, Babele</li>
-<li>Vincent Puig &#8211; IRI</li>
-<li>Harry Halpin &#8211; SocialWeb</li>
-<li>Clément Alteresco &#8211; Bureauxapartager</li>
-<li>Olivier Creiche &#8211; Zilok Auto</li>
-<li>Melchior Schöller &#8211; Poutsch</li>
+	<li>Robert Jäschke - L3S</li>
+	<li>Vincent Puig - IRI</li>
+	<li>Marc-Arthur Gauthey - Cup of Teach</li>
+	<li>Vincent Ricordeau - Kisskissbankbank</li>
+	<li>Frédéric Mazzella - Blablacar</li>
+	<li>Camilla Burg - Wiser.org</li>
+	<li>Frédéric Chomé – Factor-X</li>
+	<li>Deborah Elalouf - Tralalere</li>
+	<li>Pirjo Friedrich - VTT Technical Research Centre of Finland</li>
+	<li>John Sutcliffe-Brathwait - Metaloger Technologies</li>
+	<li>Clément Alteresco - Bureauxapartager</li>
+	<li>Olivier Creiche - Zilok Auto</li>
+	<li>Benjamin Augros – Pretachanger</li>
+	<li>Anne-Alice Fievet – Makesense</li>
+	<li>Coralie Marin - La Ruche qui dit Oui</li>
+	<li>Antonin Léonard - Ouishare</li>
+	<li>Benjamin des Gachons – Change.org</li>
+	<li>Gaël Musquet - Open Street Map</li>
+	<li>Etienne Zoupic Hayem - Community Forge</li>
+	<li>Edouard Schlumberger - Voxe.org</li>
+	<li>Ruxandra Creosteanu - Babele</li>
+	<li>Florian Hervéou - Tuttivox</li>
+	<li>David Crombie - HKU</li>
+	<li>Eric Nicolas Schneider - Youth-Leader</li>
+	<li>Benjamin Augros - Pretachanger</li>
+	<li>Théo Bondolfi - Meta CAPS Cluster</li>
 </ul>
 <div>The conference will be held in English at the Centre Pompidou, Salle Triangle (to right of main entrance, next to large red cube outside of building) :<br />
 <br />
-<img src=\"http://www.iri.centrepompidou.fr/res/img/photo_salle_iri.jpg\" alt=\"Salle Triangle\" /></div>",
+<img src=\"http://www.iri.centrepompidou.fr/res/img/photo_salle_iri.jpg\" alt=\"Salle Triangle\" /></div>
+<div style=\"clear: both\">
+<p>
+Lunch will not be provided at the information day. There are however many restaurant options surrounding the Centre Pompidou that you can go to during the 1-hour break.
+</p>
+<p>
+If you plan to be in Paris for the night after this infoday, MetaCAPS invites you to a CAPS infoday after hours cocktail to celebrate the launching of the metaCAPS website, and socialize between project holders @CAPS. MetaCAPS is an innovative mechanism that aims to overcome the divide between competition and cooperation through a coopetitive response to this call CAPS (FP7 5.5.). The event will take place at Atelier de Rochas, 14 rue des Volontaires 75015 Paris.
+</p>
+        ",
    	'link' => 'http://www.iri.centrepompidou.fr/evenement/collective-awareness-platforms-for-sustainability-and-social-innovation/',
    	'keywords'   => 'CAPS, Europe, IRI',
-   	'rep' => basename('__DIR__'),
+   	'rep' => basename(__DIR__),
     'islive'	 => true,
-   	'partenaires'=> "",
+   	'partenaires'=> "<a href='http://www.iri.centrepompidou.fr' class='footerlink' target='_blank'> IRI </a>
+        | <a href='http://ec.europa.eu/digital-agenda/' class='footerLink' target='_blank' > European Commission </a>",
 
     'client_visual' => 'images/caps2012_live_screen.jpg',// 480 × 320 pixels
     
diff -r 78ba6e14f159 -r a7b8011c91dd web/tweet_ajax.php
--- a/web/tweet_ajax.php	Tue Oct 16 10:03:17 2012 +0200
+++ b/web/tweet_ajax.php	Tue Oct 16 12:00:10 2012 +0200
@@ -18,7 +18,7 @@
      */
     $token = unserialize($_SESSION['TWITTER_ACCESS_TOKEN']);
     $client = $token->getHttpClient($configuration);
-    $client->setUri('http://api.twitter.com/1/statuses/update.json');
+    $client->setUri('http://api.twitter.com/1.1/statuses/update.json');
     $client->setMethod(Zend_Http_Client::POST);
     $client->setParameterPost('status', $_POST['status']);
     $response = $client->request();