website - The code for sublab.org

Age	Commit message (Collapse)	Author
2012-06-24	Elektronikrunde added	Christian Koch

2012-06-08	removed stream url	phaidros

2012-06-07	added dj	phaidros

2012-06-07	added stream	phaidros

2012-05-20	Fix LHCIII Datum	Benjamin Kiessling

2012-05-10	encoding fixed	Christian Koch

2012-05-10	Blitzortungsstation	Christian Koch

2012-05-05	Termin Techniksprechstunde ergaenzt	Christian Koch

2012-05-02	flyer mai	Christian Franke

2012-04-24	Dr. Nerds Techniksprechstunde	Benjamin Kiessling

2012-04-23	Gieszerstrassenfest	Benjamin Kiessling

2012-04-23	If you like it you have to put a date on it	Benjamin Kiessling

2012-04-23	Remove outdated topic	Benjamin Kiessling

2012-04-14	Update topic	Christian Franke

2012-04-12	Fixup encoding, move telfone down	Christian Franke

2012-04-06	Merge branch 'master' of oberon.sublab.org:website	Benjamin Kiessling
	Conflicts: template/news/2012-04-06-subconf2.html
2012-04-06	Add CFP zur sub:conf II	Benjamin Kiessling

2012-04-06	Add CFP zur sub:conf II	Benjamin Kiessling

2012-04-02	Revert "April fool"	Christian Franke
	This reverts commit 61f7ca0fa09d168f9f731233aef8f872aa0dbf6a.
2012-04-01	Flyer CSS hotfix	David Lamparter
	can't fix this properly, the CSS is used in many places and I don't know the design really
2012-04-01	Flyer April	David Lamparter

2012-04-01	April fool	Christian Franke

2012-03-29	added stream for tonite	kloschi klosch

2012-03-29	added *~ to gitignore	kloschi klosch

2012-03-19	dates update	Florian

2012-03-18	Add a mockup page for subconf 2	Christian Franke

2012-03-13	Clusterworkshop	Benjamin Kiessling

2012-03-13	Revert "Add clusterworkshop"	Benjamin Kiessling
	This reverts commit 318531a1019b946010fa7774515d2fb463c4efd7.
2012-03-13	Update topic	Benjamin Kiessling

2012-03-13	Add clusterworkshop	Benjamin Kiessling

2012-03-05	minor fixes in termine page	Florian

2012-03-05	added more dates for this week to topic	Florian

2012-03-05	optimized flyer name for download	Florian

2012-03-05	renamed flyer image	Florian

2012-03-05	Termine aufgeraeumt	Florian

2012-03-05	added maerz flyer to webpage termine page	Florian

2012-03-05	put new dates to topic	Florian

2012-02-29	added sublounge to topic	Florian

2012-02-29	changed some char displaz errors	Florian

2012-02-29	updated impressum	Florian

2012-02-25	Wasser ist wieder aufgetaut.	Benjamin Kiessling

2012-02-25	changed topic to rohre frei	Florian

2012-02-22	Add link to aeroponics page	Benjamin Kiessling

2012-02-06	added rapman pictures to rapman newspost	Florian

2012-02-06	added rapman pictures	Florian

2012-02-05	changed topic to cancel all events	Florian

2012-02-03	no phantomspeisung topic	Florian

2012-02-03	namefailfix for rapmannewspost	Florian

2012-02-03	added newspost for wasserleitungsfail	Florian

2012-02-03	Revert "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.