website - The code for sublab.org

Age	Commit message (Collapse)	Author
2012-04-12	Fixup encoding, move telfone down	Christian Franke

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-03-18	Add a mockup page for subconf 2	Christian Franke

2012-03-05	minor fixes in termine page	Florian

2012-03-05	optimized flyer name for download	Florian

2012-03-05	Termine aufgeraeumt	Florian

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

2012-02-29	changed some char displaz errors	Florian

2012-02-29	updated impressum	Florian

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

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.
2012-02-02	Merge branch 'master' of sublab.org:website	kloschi klosch
	Conflicts: public/img/onewire/digitemp.jpg template/news/2011-12-07-frieren.html template/pages/projekte/content.html template/pages/verein/content.html template/pages/vokue/content.html template/template/template.html template/topic/topic
2012-01-29	added newline on page 'Verein'	Lutz Ballaschke

2012-01-29	added link and file: einzugsermaechtigung.pdf	Lutz Ballaschke

2012-01-12	updated other dates in termine page	Florian

2012-01-12	changed name of montagsrunde in termine page	Florian

2012-01-12	comment out 404 links in projekte page	Florian

2012-01-12	added more projekte to projekte page	Florian

2012-01-12	added phantomspeisung projekte page	Florian

2012-01-12	added more projekte	Florian

2012-01-12	updated termine	Florian

2012-01-12	moved phantomspeisung page to exploit rewrite rule on server	Florian

2012-01-12	added phantomspeisung page	Florian

2012-01-12	updated metadata for subconf subpage	Florian

2012-01-12	added license information for subcponf photos	Florian

2012-01-12	finished unfinished sentence in subconf article	Florian

2012-01-12	updated schedule and texts for subconf subpage	Florian

2012-01-12	added subconf subpage	Florian

2012-01-12	bug fix in projekte subpage	Florian

2012-01-12	added first content to projekte page	Florian

2012-01-12	updated keyqords for projekte page	Florian

2012-01-12	updated englisch descripton for projekte page	Florian

2012-01-12	updated projekte description in german	Florian

2012-01-12	added projekte folder	Florian

2012-01-12	Revert "Dachcam does not work anymore, remove"	Christian Franke

2012-01-12	added documents to verein subpage	Florian

2012-01-12	changed style of webcam page	Florian

2012-01-12	added sublab logo to impressum	Florian

2012-01-12	added was ist das sublab and ubucon presi to verein page	Florian

2011-12-04	moved phantomspeisung page to exploit rewrite rule on server	Florian

2011-12-04	added phantomspeisung page	Florian

2011-12-03	updated metadata for subconf subpage	Florian

2011-12-03	added license information for subcponf photos	Florian

2011-12-03	finished unfinished sentence in subconf article	Florian

2011-12-03	updated schedule and texts for subconf subpage	Florian

2011-12-02	added subconf subpage	Florian

2011-11-30	bug fix in projekte subpage	Florian

2011-11-30	added first content to projekte page	Florian

2011-11-30	updated keyqords for projekte page	Florian