summaryrefslogtreecommitdiff
path: root/template/template
AgeCommit message (Collapse)Author
2012-09-16Add some stuff for the wikiChristian Franke
2012-09-16URLs should be absoluteChristian Franke
2012-09-12use canbus door info for statusChristian Franke
2012-08-19Revert "LHC III"Florian
One should not edit the template but the topic file. TM This reverts commit 582fe1299449d34c7deeceddf390b97a5ed3e419.
2012-07-18LHC IIIBenjamin Kiessling
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.
2012-02-02Merge branch 'master' of sublab.org:websitekloschi 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-27added 'width' parameter to temperature graph thumbnailLutz Ballaschke
2012-01-19added closing object-tagLutz Ballaschke
2012-01-19added thumbnail to yet another temperature graphLutz Ballaschke
2012-01-12added projekte link to main menuFlorian
2012-01-12added hackstatt to sublab footer linksFlorian
2012-01-12typofix in templateFlorian
2012-01-12updated template for showing tempgraphFlorian
2012-01-12added template update for become member displayFlorian
2011-11-13added template update for become member displayFlorian
2011-11-02rename css to force refetch though cachedChristian Franke
2011-11-02some more w3c fixesChristian Franke
2011-11-02fix some problems with HTML5 standardChristian Franke
2011-10-27stupid bug fixes for image boxFlorian
2011-10-27added imagebox, for better display of imagesFlorian
2011-10-23Add link to the new Mate pageConrad Hoffmann
2011-10-10Move sublab.css to sublab-new.css to fix caching problemsBenjamin Kiessling
2011-10-08place new template scriptChristian Franke