summaryrefslogtreecommitdiff
path: root/template
AgeCommit message (Collapse)Author
2012-02-06added rapman pictures to rapman newspostFlorian
2012-02-05changed topic to cancel all eventsFlorian
2012-02-03no phantomspeisung topicFlorian
2012-02-03namefailfix for rapmannewspostFlorian
2012-02-03added newspost for wasserleitungsfailFlorian
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-02added newlineskloschi klosch
2012-02-02removed == fragmentskloschi klosch
2012-02-02added streamlinkkloschi klosch
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-02-01Add linkBenjamin Kiessling
2012-02-01Add RapmanBenjamin Kiessling
2012-01-29added newline on page 'Verein'Lutz Ballaschke
2012-01-29added link and file: einzugsermaechtigung.pdfLutz Ballaschke
2012-01-27added 'width' parameter to temperature graph thumbnailLutz Ballaschke
2012-01-23Update TopicBenjamin Kiessling
2012-01-19added closing object-tagLutz Ballaschke
2012-01-19added thumbnail to yet another temperature graphLutz Ballaschke
2012-01-19Ankuendigung westnetzgruendungBenjamin Kiessling
2012-01-17Update topicBenjamin Kiessling
2012-01-16Tuersteuerung newsBenjamin Kiessling
2012-01-12Update topicBenjamin Kiessling
2012-01-12added fablabstammtisch newspostFlorian
2012-01-12updated other dates in termine pageFlorian
2012-01-12changed name of montagsrunde in termine pageFlorian
2012-01-12Update topicBenjamin Kiessling
2012-01-12comment out 404 links in projekte pageFlorian
2012-01-12added silvesterlounge to topicFlorian
2012-01-12added more projekte to projekte pageFlorian
2012-01-12added phantomspeisung projekte pageFlorian
2012-01-12added projekte link to main menuFlorian
2012-01-12added more projekteFlorian
2012-01-12delted wotorwoerld from topicFlorian
2012-01-12updated termineFlorian
2012-01-12updated topicFlorian
2012-01-12added links to hackstatt newsFlorian
2012-01-12added hackstat presi newsFlorian
2012-01-12added hackstatt to sublab footer linksFlorian
2012-01-12added onewire image to frieren newspostFlorian
2012-01-12updated frieren news post with hint for status temp graphFlorian
2012-01-12added otb release news postFlorian
2012-01-12updated topic for wotorwoerldFlorian
2012-01-12typo in wotorwoerld newsFlorian
2012-01-12included wotorwoerld imagesFlorian
2012-01-12link fix wotorwoerld newsFlorian
2012-01-12added wotorworld announce newsFlorian
2012-01-12typofix in templateFlorian
2012-01-12updated template for showing tempgraphFlorian
2012-01-12updatet topic for outside the boxFlorian
2012-01-12TemperatursensorenBenjamin Kiessling