Merge branch 'master' of git://git.c3d2.de/c3d2-web

content/events.xml

@@ -1698,14 +1698,12 @@
     <location>Ghent</location>
     <link>http://2014.brucon.org/</link>
   </event>
-<!-- Scheune hat den Termin abgesagt
-	<event title="Datenspuren 2014">
-    <start>2014-09-27</start>
-    <end>2014-09-28</end>
+  <event title="Datenspuren 2014">
+    <start>2014-09-13</start>
+    <end>2014-09-14</end>
     <location>Kulturzentrum Scheune, Alaunstr. 36-40, 01099 Dresden</location>
     <link>https://datenspuren.de/</link>
-	</event>
--->
+  </event>
   <event title="Hackover">
     <start>2013-10-24</start>
     <end>2013-10-26</end>
@@ -1789,4 +1787,20 @@
     <location>CoFab</location>
     <link>http://lanyrd.com/2014/wmdd/</link>
   </event>
+  <event title="Arduino OpenSpace">
+    <start>2014-02-08T09:00:00</start>
+    <end>2014-02-08T17:00:00</end>
+    <location>CoFab, Pohlandstrasse 19, 01309 Dresden</location>
+    <link>http://www.agile-hardware.de/fuenfter-arduino-openspace-08-02-2014/</link>
+  </event>
+  <event title="easterhegg">
+    <start>2014-04-18</start>
+    <end>2014-04-21</end>
+    <location>Stuttgart</location>
+    <link>http://eh14.easterhegg.eu/</link>
+  </event>
+  <event title="Inter&#173;nationaler Protest&#173;tag ge&#173;gen Massen&#173;über&#173;wachung">
+    <start>2014-02-11</start>
+    <link>https://thedaywefightback.org/</link>
+  </event>
 </calendar>

content/news/pentaradio24-20140128.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
+<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
+<item title="pentaradio24: Hackumentary"
+      date="2014-01-27T22:31:00"
+      author="Astro">
+  <image title="(((pentaradio))">../pentaradio.png</image>
+
+  <p>
+    The documentary filmmakers of <link
+    href="http://hackumentary.cc/">Hackumentary</link> are in town,
+    intending to travel european hackerspaces and share their
+    experience with open source methods. We want to know more!
+  </p>
+  <p>
+    Tune in live next tuesday (Nov 26th) from 21:30 to 23:00 central
+    european time on <link
+    href="http://coloradio.org/">coloRadio</link> (<link
+    href="http://hub.fueralle.org/coloradio160mp3.m3u">Stream</link>). Participate
+    in our 
+    <link href="muc.html">Chat!</link> Got questions?
+    <link href="tel:+49-351-32054711">Call in!</link>
+  </p>
+
+</item>

content/static/autodiscover/autodiscover.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
+<Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a">
+<!-- ### ### ### C3D2 ### ### ### -->
+
+<Account>
+<AccountType>email</AccountType>
+<Action>settings</Action>
+<ServiceHome>http://www.c3d2.de</ServiceHome>
+
+<Protocol>
+<Type>IMAP</Type>
+<Server>mail.c3d2.de</Server>
+<Port>993</Port>
+<DomainRequired>on</DomainRequired>
+<LoginName></LoginName>
+<SPA>off</SPA>
+<SSL>on</SSL>
+<AuthRequired>on</AuthRequired>
+</Protocol>
+
+<!-- <Protocol> -->
+<!-- <Type>POP3</Type> -->
+<!-- <Server>mail.c3d2.de</Server> -->
+<!-- <Port>995</Port> -->
+<!-- <DomainRequired>on</DomainRequired> -->
+<!-- <LoginName></LoginName> -->
+<!-- <SPA>off</SPA> -->
+<!-- <SSL>on</SSL> -->
+<!-- <AuthRequired>on</AuthRequired> -->
+<!-- </Protocol> -->
+
+<Protocol>
+<Type>SMTP</Type>
+<Server>mail.c3d2.de</Server>
+<Port>587</Port>
+<DomainRequired>on</DomainRequired>
+<LoginName></LoginName>
+<SPA>off</SPA>
+<Encryption>TLS</Encryption>
+<AuthRequired>on</AuthRequired>
+<UsePOPAuth>off</UsePOPAuth>
+<SMTPLast>on</SMTPLast>
+</Protocol>
+
+</Account>
+
+<!-- ### ### ### C3D2 ### ### ### -->
+</Response>
+</Autodiscover>