website - The code for sublab.org

Age	Commit message (Collapse)	Author
2014-04-09	better logo for cryptocon14, cleanup	Florian

2014-04-08	typofix in filename	Florian

2014-04-08	updated cryptocon14 page	Florian

2014-03-14	Actually add image to git	Christian Franke

2013-06-20	Remove vokue page, it's in the wiki now	Christian Franke

2013-04-26	added kickerfix news	Florian

2013-04-25	added image for ledpar news	Florian

2013-04-25	sustituted image on homepage	Florian

2013-04-25	sustituted image on termine page	Florian

2013-04-23	deleted old werkstatt images	Florian

2013-04-19	added more lage pictures	Florian

2013-04-19	added keyboard for door code image to termine page	Florian

2013-04-19	added new werkstatt images to raeume page	Florian

2013-04-19	added new uhrenraum image	Florian

2013-04-19	added blickvomdach image	Florian

2013-04-19	added new hacklab image	Florian

2013-04-19	added new buero image	Florian

2013-04-19	added new uhrfotos for homepage	Florian

2013-04-19	added new blickindielounge image	Florian

2013-04-15	cryptocon13 picture to CryptoCon-Page	Florian

2013-03-20	added latest flyer version	Florian

2013-03-20	added latest cryptocon version	Florian

2013-03-09	added cryptocon flyer	Florian

2013-02-11	Add SVG to git	Christian Franke

2012-09-24	updated hacklab photos	Florian

2012-09-21	made heissluft news a bit nicer	Florian

2012-09-21	added uhr pictures	Florian

2012-09-21	added/updated uhrenraum pictures	Florian

2012-09-21	added buero pictures	Florian

2012-09-21	new bar pictures	Florian

2012-09-21	new werkstatt pictures	Florian

2012-09-20	added sublab door photo	Florian

2012-09-18	show status image in website header	Florian

2012-09-18	make spaceapi logos a bit smaller	Christian Franke

2012-09-16	added spaceapi status icons	Florian

2012-09-07	update subweg.jpg	Christian Franke

2012-09-04	add image to lage	Christian Franke

2012-08-18	thumbnail fuers kuechenbild gebaut und eingebunden	Florian

2012-08-16	Kuechenpost	Benjamin Kiessling

2012-08-02	Include image	Benjamin Kiessling

2012-07-18	sub:mate artikel	Benjamin Kiessling

2012-07-02	Lichtwuerste 111elf!	Benjamin Kiessling

2012-05-02	flyer mai	Christian Franke

2012-04-02	Revert "April fool"	Christian Franke
	This reverts commit 61f7ca0fa09d168f9f731233aef8f872aa0dbf6a.
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.