summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-24Elektronikrunde addedChristian Koch
2012-06-08removed stream urlphaidros
2012-06-07added djphaidros
2012-06-07added streamphaidros
2012-05-20Fix LHCIII DatumBenjamin Kiessling
2012-05-10encoding fixedChristian Koch
2012-05-10BlitzortungsstationChristian Koch
2012-05-05Termin Techniksprechstunde ergaenztChristian Koch
2012-05-02flyer maiChristian Franke
2012-04-24Dr. Nerds TechniksprechstundeBenjamin Kiessling
2012-04-23GieszerstrassenfestBenjamin Kiessling
2012-04-23If you like it you have to put a date on itBenjamin Kiessling
2012-04-23Remove outdated topicBenjamin Kiessling
2012-04-14Update topicChristian Franke
2012-04-12Fixup encoding, move telfone downChristian Franke
2012-04-06Merge branch 'master' of oberon.sublab.org:websiteBenjamin Kiessling
Conflicts: template/news/2012-04-06-subconf2.html
2012-04-06Add CFP zur sub:conf IIBenjamin Kiessling
2012-04-06Add CFP zur sub:conf IIBenjamin Kiessling
2012-04-02Revert "April fool"Christian Franke
This reverts commit 61f7ca0fa09d168f9f731233aef8f872aa0dbf6a.
2012-04-01Flyer CSS hotfixDavid Lamparter
can't fix this properly, the CSS is used in many places and I don't know the design really
2012-04-01Flyer AprilDavid Lamparter
2012-04-01April foolChristian Franke
2012-03-29added stream for tonitekloschi klosch
2012-03-29added *~ to gitignorekloschi klosch
2012-03-19dates updateFlorian
2012-03-18Add a mockup page for subconf 2Christian Franke
2012-03-13ClusterworkshopBenjamin Kiessling
2012-03-13Revert "Add clusterworkshop"Benjamin Kiessling
This reverts commit 318531a1019b946010fa7774515d2fb463c4efd7.
2012-03-13Update topicBenjamin Kiessling
2012-03-13Add clusterworkshopBenjamin Kiessling
2012-03-05minor fixes in termine pageFlorian
2012-03-05added more dates for this week to topicFlorian
2012-03-05optimized flyer name for downloadFlorian
2012-03-05renamed flyer imageFlorian
2012-03-05Termine aufgeraeumtFlorian
2012-03-05added maerz flyer to webpage termine pageFlorian
2012-03-05put new dates to topicFlorian
2012-02-29added sublounge to topicFlorian
2012-02-29changed some char displaz errorsFlorian
2012-02-29updated impressumFlorian
2012-02-25Wasser ist wieder aufgetaut.Benjamin Kiessling
2012-02-25changed topic to rohre freiFlorian
2012-02-22Add link to aeroponics pageBenjamin Kiessling
2012-02-06added rapman pictures to rapman newspostFlorian
2012-02-06added rapman picturesFlorian
2012-02-05changed topic to cancel all eventsFlorian
2012-02-03no phantomspeisung topicFlorian
2012-02-03namefailfix for rapmannewspostFlorian
2012-02-03added newspost for wasserleitungsfailFlorian
2012-02-03Revert "Merge branch 'master' of sublab.org:website"Christian Franke
This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f. Conflicts: template/topic/topic Guys, please learn how to use git. Have a look at $ git diff origin/master master and check if it looks reasonable. Also, if there is a merge in the history, in our case, it is almost always bad. When you pull, use $ git pull --rebase --ff-only and not just a pull without arguments.