website - The code for sublab.org

Age	Commit message (Collapse)	Author
2012-04-01	Flyer April	David Lamparter

2012-04-01	April fool	Christian Franke

2012-03-05	renamed flyer image	Florian

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

2012-02-06	added rapman pictures	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.
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-12	added onewire thumbnail	Florian

2012-01-12	Revert "added tempgraph images, to be replaces when script is running"	Christian Franke
	This reverts commit 789067d7da9053f443bc5d7cd816500b8a246057.
2012-01-12	added braeter image	Florian

2012-01-12	added onewire images	Florian

2012-01-12	added tempgraph images, to be replaces when script is running	Florian

2012-01-12	added wotorwoerld images	Florian

2012-01-12	added digitemp screenshot	Florian

2012-01-12	added phantomspeisung pictures in subfolder	Florian

2012-01-12	added westpaket images	Florian

2012-01-12	added westpaket images	Florian

2012-01-12	added small versions of the subconf images	Florian

2012-01-12	added subconf images	Florian

2012-01-12	add newspost about sfp module	Christian Franke

2012-01-12	removed faces from klub analog.jpg	Florian

2012-01-12	added preview image of klub_analog	Florian

2012-01-12	added club analog image	Florian

2012-01-12	added sublab logo to repo	Florian

2012-01-12	added wasistdassublab image	Florian

2012-01-12	added presi image	Florian

2012-01-12	Aeroponie news	Benjamin Kiessling

2011-12-05	added digitemp screenshot	Florian

2011-12-04	added phantomspeisung pictures in subfolder	Florian

2011-12-03	added westpaket images	Florian

2011-12-03	added westpaket images	Florian

2011-12-02	added small versions of the subconf images	Florian

2011-12-02	added subconf images	Florian

2011-11-20	add newspost about sfp module	Christian Franke

2011-11-08	removed faces from klub analog.jpg	Florian

2011-11-08	added preview image of klub_analog	Florian

2011-11-08	added club analog image	Florian

2011-11-04	added sublab logo to repo	Florian

2011-11-04	added wasistdassublab image	Florian

2011-11-04	added presi image	Florian

2011-11-03	Growbox news	Benjamin Kiessling

2011-11-02	write newspost about isdn	Christian Franke

2011-10-28	added images to repo and roomes page	Florian

2011-10-09	News post rackconsole	Christian Franke

2011-10-08	Add news post about switchtest	Christian Franke

2011-10-06	Reduce image size	Christian Franke

2011-10-04	Rotate image	Benjamin Kiessling

2011-10-04	Add CAN-PCB blurb	Benjamin Kiessling

2011-08-19	added lost and found	Florian

2011-04-16	Revert "Merge branch 'master' of oberon.sublab.org:website"	Christian Franke
	This reverts commit 9f12b48d2ca69adb6b95e4f003520efea10d444a, reversing changes made to cf403925786976a937b5fd33b7eacf7598009c47.