summaryrefslogtreecommitdiff
path: root/template/news
AgeCommit message (Collapse)Author
2012-02-06added rapman pictures to rapman newspostFlorian
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-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-19Ankuendigung westnetzgruendungBenjamin Kiessling
2012-01-16Tuersteuerung newsBenjamin Kiessling
2012-01-12added fablabstammtisch newspostFlorian
2012-01-12added links to hackstatt newsFlorian
2012-01-12added hackstat presi newsFlorian
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-12typo in wotorwoerld newsFlorian
2012-01-12included wotorwoerld imagesFlorian
2012-01-12link fix wotorwoerld newsFlorian
2012-01-12added wotorworld announce newsFlorian
2012-01-12TemperatursensorenBenjamin Kiessling
2012-01-12Man kann auch Binnen-I und Gendergap kombinieren. Ist laut Duden sowiesoBenjamin Kiessling
alles falsch Revert "Entweder binnen-I oder gendergap :/" This reverts commit 4bb4cc3919f3d7a3c9d384066daa68696942a127.
2012-01-12Entweder binnen-I oder gendergap :/Christian Franke
2012-01-12Extend westpaket newspostChristian Franke
2012-01-12Change title of news itemBenjamin Kiessling
2012-01-12added westpaket newspostFlorian
2012-01-12change image for subconf newspostFlorian
2012-01-12added image to subconf newspostFlorian
2012-01-12updated subconf newspostFlorian
2012-01-12Subconf is overBenjamin Kiessling
2012-01-12add newspost about sfp moduleChristian Franke
2012-01-12add newspost about cgitChristian Franke
2012-01-12bugfixing in klubanalog newspostFlorian
2012-01-12added klub analog newsFlorian
2012-01-12fixed typo in a class img in news postsFlorian
2012-01-12fixed dotted line below images in newsFlorian
2012-01-12Fix typosBenjamin Kiessling
2012-01-12Aeroponie newsBenjamin Kiessling
2011-12-08TemperatursensorenBenjamin Kiessling
2011-12-07Man kann auch Binnen-I und Gendergap kombinieren. Ist laut Duden sowiesoBenjamin Kiessling
alles falsch Revert "Entweder binnen-I oder gendergap :/" This reverts commit 4bb4cc3919f3d7a3c9d384066daa68696942a127.
2011-12-05Entweder binnen-I oder gendergap :/Christian Franke
2011-12-05Extend westpaket newspostChristian Franke
2011-12-03Change title of news itemBenjamin Kiessling
2011-12-03added westpaket newspostFlorian
2011-12-03change image for subconf newspostFlorian
2011-12-03added image to subconf newspostFlorian
2011-12-03updated subconf newspostFlorian
2011-12-01Subconf is overBenjamin Kiessling
2011-11-20add newspost about sfp moduleChristian Franke
2011-11-09add newspost about cgitChristian Franke
2011-11-08bugfixing in klubanalog newspostFlorian