Pārlūkot izejas kodu

updating schedule

chootka 9 gadi atpakaļ
vecāks
revīzija
bb6d239fdc
2 mainītis faili ar 80 papildinājumiem un 76 dzēšanām
  1. 41 39
      _site/program/index.html
  2. 39 37
      program/index.html

+ 41 - 39
_site/program/index.html

@@ -92,8 +92,8 @@
 	<thead>
 		<tr>
 		    <th></th>
+		    <th>Lecture Hall</th>
 		    <th>Town Square East</th>
-		    <th>Town Square West</th>
 		    <th>Room 806</th>
 		    <th>Room 845</th>
 		    <th>Room 811</th>
@@ -115,10 +115,9 @@
 			<td></td>
 			<td></td>
 			<td></td>
-			<!--td>Nicolas Knouf</td-->
 		</tr>
 		<tr>
-			<td>10:30 - 11:30</td>
+			<td>10:30 - 11:15</td>
 			<td>
 				‘This band is your band, this band is my band...’</br>
 				<a href="../speakers/rachel-odwyer">Rachel Dwyer</a>
@@ -176,7 +175,7 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td>13:30 - 14:50</td>
+			<td>13:40 - 14:40</td>
 			<td>
 				I Will Follow You Into the Dark[net]</br>
 				<a href="../speakers/david-huerta">David Huerta</a> + <a href="../speakers/caroline-sinders">Caroline Sinders</a> + <a href="../speakers/stephanie-hyland">Stephanie Hyland</a>
@@ -206,7 +205,7 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td>16:00 - 16:40</td>
+			<td>16:00 - 16:30</td>
 			<td>
 				MAC as a Place and Landscape</br>
 				<a href="../speakers/garry-ing">Garry Ing</a>
@@ -215,13 +214,13 @@
 				Democracy Through Grassroot Local Networks</br>
 				<a href="../speakers/joe-chasinga">Joe Chasinga</a>
 			</td>
-			<td class="workshop" rowspan="4">
+			<td class="workshop" rowspan="5">
 				There Is No Cloud: Dumping Dropbox to Create a Personal Anti-Cloud For Cheap (Workshop)</br>
 				<a href="../speakers/joshua-kopstein">Joshua Kopstein</a>
 			</td>
 		</tr>
 		<tr>
-			<td>16:40 - 17:10</td>
+			<td>16:40 - 17:00</td>
 			<td>Dan Phiffer</td>
 			<td>
 				Public transportation GPS Tracking</br>
@@ -229,25 +228,30 @@
 			</td>
 		</tr>
 		<tr>
-			<td>17:10 - 18:20</td>
-			<td>
+			<td>17:10 - 17:40</td>
+			<td rowspan="2">
 				GSM For Good</br>
 				<a href="../speakers/benedetta-piantella">Benedetta Piantella</a>
 			</td>
 			<td>
-				Bibliotecha (until 17:40)</br>
+				Bibliotecha</br>
 				<a href="../speakers/andre-castro">Andre Castro</a>, <a href="../speakers/lucia-dossin">Lucia Dossin</a>
 			</td>
 			<td></td>
 			<td></td>
 		</tr>
 		<tr>
-			<td>18:20 - 19:00</td>
+			<td>17:40 - 18:10</td>
+			<td rowspan="2">Lightning Sessions</td>
+			<td></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>18:20 - 18:50</td>
 			<td>
 				Security &amp; Privacy in Mesh Networks</br>
 				<a href="../speakers/paige-peterson">Paige Peterson</a>
 			</td>
-			<td>Lightning Sessions</td>
 			<td></td>
 			<td></td>
 		</tr>
@@ -267,8 +271,8 @@
 	<thead>
 		<tr>
 		    <th></th>
+		    <th>Lecture Hall</th>
 		    <th>Town Square East</th>
-		    <th>Town Square West</th>
 		    <th>Room 806</th>
 		    <th>Room 845</th>
 		    <th>Room 811</th>
@@ -292,7 +296,7 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td>10:30 - 11:30</td>
+			<td>10:30 - 11:20</td>
 			<td>
 				On being the alternative in the absence of alternatives</br>
 				<a href="../speakers/keith-whyte/">Keith Whyte (Rhizomatica)</a>
@@ -330,7 +334,7 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td>13:00 - 14:10</td>
+			<td>13:00 - 14:00</td>
 			<td>
 				Alternet</br>
 				<a href="../speakers/sarah-gold/">Sarah T. Gold</a>
@@ -350,7 +354,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td>14:10 - 14:50</td>
+			<td>14:10 - 14:40</td>
 			<td>
 				Bringing Connectivity to Rural Areas in Bangladesh</br>
 				<a href="../speakers/lutfor-rahman/">Dr. Lutfor Rahman</a>
@@ -369,7 +373,7 @@
 			</td>
 			<td>
 				Decentralized Peer To Peer Social Networks</br>
-				Oliver Fischer
+				Oliver Fisher
 			</td>
 		</tr>
 		<tr class="light">
@@ -378,41 +382,42 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td>16:00 - 17:10</td>
+			<td>16:00 - 17:00</td>
 			<td>
 				Anti-Colonial Hacking</br>
 				<a href="../speakers/sophie-toupin/">Sophie Toupin</a>
 			</td>
 			<td>
-				Probe Kit (till 16:30)</br>
-				<a href="../speakers/nick-briz/">Nick Briz</a> + <a href="../speakers/brannon-dorsey/">Brannon Dorsey</a>
-			</td>
-		</tr>
-		<tr>
-			<td>16:30 - 17:10</td>
-			<td></td>
-			<td>
-				Signal Strength + The Community Phonebooth</br>
-				<a href="../speakers/amelia-marzec/">Amelia Marzec</a>
+				<a href="../speakers/israeli-pirates/">Israeli Pirates</a>
 			</td>
 		</tr>
 		<tr>
-			<td>17:10 - 18:10</td>
-			<td>
+			<td>17:10 - 17:30</td>
+			<td rowspan="2">
 				Stupid, Messy Networks</br>
 				<a href="../speakers/jochen-maria-weber/">Jochen Maria Weber</a>
 			</td>
 			<td>
-				Be your own NSA: Regain IO control. (till 17:30)<br/>
+				Be your own NSA: Regain IO control.<br/>
 				<a href="../speakers/yifu-guo/">Yifu Guo</a>
 			</td>
+		</tr>
+		<tr>
+			<td>17:30 - 18:00</td>
+			<td>
+				Probe Kit</br>
+				<a href="../speakers/nick-briz/">Nick Briz</a> + <a href="../speakers/brannon-dorsey/">Brannon Dorsey</a>
+			</td>
 			<td></td>
 			<td></td>
 			<td></td>
 		</tr>
 		<tr>
-			<td>17:30 - 18:10</td>
-			<td></td>
+			<td>18:10 - 18:30</td>
+			<td rowspan="2">
+				Crowd-Sourced Social Media Network Surveillance<br/>
+				<a href="../speakers/derek-curry/">Derek Curry</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
+			</td>
 			<td>
 				MTOS, Federated, Public Key Secured, Social Communications Infrastructure<br/>
 				<a href="../speakers/andrew-davis/">Andrew Davis</a>
@@ -422,13 +427,10 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td>18:10 - 19:00</td>
-			<td>
-				Crowd-Sourced Social Media Network Surveillance<br/>
-				<a href="../speakers/derek-curry/">Derek Curry</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
-			</td>
+			<td>18:30 - 19:00</td>
 			<td>
-				<a href="../speakers/israeli-pirates/">Israeli Pirates</a>
+				Signal Strength + The Community Phonebooth</br>
+				<a href="../speakers/amelia-marzec/">Amelia Marzec</a>
 			</td>
 			<td></td>
 			<td></td>

+ 39 - 37
program/index.html

@@ -31,10 +31,9 @@ group: navigation
 			<td></td>
 			<td></td>
 			<td></td>
-			<!--td>Nicolas Knouf</td-->
 		</tr>
 		<tr>
-			<td>10:30 - 11:30</td>
+			<td>10:30 - 11:15</td>
 			<td>
 				‘This band is your band, this band is my band...’</br>
 				<a href="../speakers/rachel-odwyer">Rachel Dwyer</a>
@@ -92,7 +91,7 @@ group: navigation
 			<td></td>
 		</tr>
 		<tr>
-			<td>13:30 - 14:50</td>
+			<td>13:40 - 14:40</td>
 			<td>
 				I Will Follow You Into the Dark[net]</br>
 				<a href="../speakers/david-huerta">David Huerta</a> + <a href="../speakers/caroline-sinders">Caroline Sinders</a> + <a href="../speakers/stephanie-hyland">Stephanie Hyland</a>
@@ -122,7 +121,7 @@ group: navigation
 			<td></td>
 		</tr>
 		<tr>
-			<td>16:00 - 16:40</td>
+			<td>16:00 - 16:30</td>
 			<td>
 				MAC as a Place and Landscape</br>
 				<a href="../speakers/garry-ing">Garry Ing</a>
@@ -131,13 +130,13 @@ group: navigation
 				Democracy Through Grassroot Local Networks</br>
 				<a href="../speakers/joe-chasinga">Joe Chasinga</a>
 			</td>
-			<td class="workshop" rowspan="4">
+			<td class="workshop" rowspan="5">
 				There Is No Cloud: Dumping Dropbox to Create a Personal Anti-Cloud For Cheap (Workshop)</br>
 				<a href="../speakers/joshua-kopstein">Joshua Kopstein</a>
 			</td>
 		</tr>
 		<tr>
-			<td>16:40 - 17:10</td>
+			<td>16:40 - 17:00</td>
 			<td>Dan Phiffer</td>
 			<td>
 				Public transportation GPS Tracking</br>
@@ -145,25 +144,30 @@ group: navigation
 			</td>
 		</tr>
 		<tr>
-			<td>17:10 - 18:20</td>
-			<td>
+			<td>17:10 - 17:40</td>
+			<td rowspan="2">
 				GSM For Good</br>
 				<a href="../speakers/benedetta-piantella">Benedetta Piantella</a>
 			</td>
 			<td>
-				Bibliotecha (until 17:40)</br>
+				Bibliotecha</br>
 				<a href="../speakers/andre-castro">Andre Castro</a>, <a href="../speakers/lucia-dossin">Lucia Dossin</a>
 			</td>
 			<td></td>
 			<td></td>
 		</tr>
 		<tr>
-			<td>18:20 - 19:00</td>
+			<td>17:40 - 18:10</td>
+			<td rowspan="2">Lightning Sessions</td>
+			<td></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>18:20 - 18:50</td>
 			<td>
 				Security &amp; Privacy in Mesh Networks</br>
 				<a href="../speakers/paige-peterson">Paige Peterson</a>
 			</td>
-			<td>Lightning Sessions</td>
 			<td></td>
 			<td></td>
 		</tr>
@@ -208,7 +212,7 @@ group: navigation
 			<td></td>
 		</tr>
 		<tr>
-			<td>10:30 - 11:30</td>
+			<td>10:30 - 11:20</td>
 			<td>
 				On being the alternative in the absence of alternatives</br>
 				<a href="../speakers/keith-whyte/">Keith Whyte (Rhizomatica)</a>
@@ -246,7 +250,7 @@ group: navigation
 			<td></td>
 		</tr>
 		<tr>
-			<td>13:00 - 14:10</td>
+			<td>13:00 - 14:00</td>
 			<td>
 				Alternet</br>
 				<a href="../speakers/sarah-gold/">Sarah T. Gold</a>
@@ -266,7 +270,7 @@ group: navigation
 			</td>
 		</tr>
 		<tr>
-			<td>14:10 - 14:50</td>
+			<td>14:10 - 14:40</td>
 			<td>
 				Bringing Connectivity to Rural Areas in Bangladesh</br>
 				<a href="../speakers/lutfor-rahman/">Dr. Lutfor Rahman</a>
@@ -285,7 +289,7 @@ group: navigation
 			</td>
 			<td>
 				Decentralized Peer To Peer Social Networks</br>
-				Oliver Fischer
+				Oliver Fisher
 			</td>
 		</tr>
 		<tr class="light">
@@ -294,41 +298,42 @@ group: navigation
 			<td></td>
 		</tr>
 		<tr>
-			<td>16:00 - 17:10</td>
+			<td>16:00 - 17:00</td>
 			<td>
 				Anti-Colonial Hacking</br>
 				<a href="../speakers/sophie-toupin/">Sophie Toupin</a>
 			</td>
 			<td>
-				Probe Kit (till 16:30)</br>
-				<a href="../speakers/nick-briz/">Nick Briz</a> + <a href="../speakers/brannon-dorsey/">Brannon Dorsey</a>
-			</td>
-		</tr>
-		<tr>
-			<td>16:30 - 17:10</td>
-			<td></td>
-			<td>
-				Signal Strength + The Community Phonebooth</br>
-				<a href="../speakers/amelia-marzec/">Amelia Marzec</a>
+				<a href="../speakers/israeli-pirates/">Israeli Pirates</a>
 			</td>
 		</tr>
 		<tr>
-			<td>17:10 - 18:10</td>
-			<td>
+			<td>17:10 - 17:30</td>
+			<td rowspan="2">
 				Stupid, Messy Networks</br>
 				<a href="../speakers/jochen-maria-weber/">Jochen Maria Weber</a>
 			</td>
 			<td>
-				Be your own NSA: Regain IO control. (till 17:30)<br/>
+				Be your own NSA: Regain IO control.<br/>
 				<a href="../speakers/yifu-guo/">Yifu Guo</a>
 			</td>
+		</tr>
+		<tr>
+			<td>17:30 - 18:00</td>
+			<td>
+				Probe Kit</br>
+				<a href="../speakers/nick-briz/">Nick Briz</a> + <a href="../speakers/brannon-dorsey/">Brannon Dorsey</a>
+			</td>
 			<td></td>
 			<td></td>
 			<td></td>
 		</tr>
 		<tr>
-			<td>17:30 - 18:10</td>
-			<td></td>
+			<td>18:10 - 18:30</td>
+			<td rowspan="2">
+				Crowd-Sourced Social Media Network Surveillance<br/>
+				<a href="../speakers/derek-curry/">Derek Curry</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
+			</td>
 			<td>
 				MTOS, Federated, Public Key Secured, Social Communications Infrastructure<br/>
 				<a href="../speakers/andrew-davis/">Andrew Davis</a>
@@ -338,13 +343,10 @@ group: navigation
 			<td></td>
 		</tr>
 		<tr>
-			<td>18:10 - 19:00</td>
-			<td>
-				Crowd-Sourced Social Media Network Surveillance<br/>
-				<a href="../speakers/derek-curry/">Derek Curry</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
-			</td>
+			<td>18:30 - 19:00</td>
 			<td>
-				<a href="../speakers/israeli-pirates/">Israeli Pirates</a>
+				Signal Strength + The Community Phonebooth</br>
+				<a href="../speakers/amelia-marzec/">Amelia Marzec</a>
 			</td>
 			<td></td>
 			<td></td>