summaryrefslogtreecommitdiff
path: root/template/pages
AgeCommit message (Collapse)Author
2012-02-29updated impressumFlorian
2012-02-22Add link to aeroponics pageBenjamin 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-29added newline on page 'Verein'Lutz Ballaschke
2012-01-29added link and file: einzugsermaechtigung.pdfLutz Ballaschke
2012-01-12updated other dates in termine pageFlorian
2012-01-12changed name of montagsrunde in termine pageFlorian
2012-01-12comment out 404 links in projekte pageFlorian
2012-01-12added more projekte to projekte pageFlorian
2012-01-12added phantomspeisung projekte pageFlorian
2012-01-12added more projekteFlorian
2012-01-12updated termineFlorian
2012-01-12moved phantomspeisung page to exploit rewrite rule on serverFlorian
2012-01-12added phantomspeisung pageFlorian
2012-01-12updated metadata for subconf subpageFlorian
2012-01-12added license information for subcponf photosFlorian
2012-01-12finished unfinished sentence in subconf articleFlorian
2012-01-12updated schedule and texts for subconf subpageFlorian
2012-01-12added subconf subpageFlorian
2012-01-12bug fix in projekte subpageFlorian
2012-01-12added first content to projekte pageFlorian
2012-01-12updated keyqords for projekte pageFlorian
2012-01-12updated englisch descripton for projekte pageFlorian
2012-01-12updated projekte description in germanFlorian
2012-01-12added projekte folderFlorian
2012-01-12Revert "Dachcam does not work anymore, remove"Christian Franke
2012-01-12added documents to verein subpageFlorian
2012-01-12changed style of webcam pageFlorian
2012-01-12added sublab logo to impressumFlorian
2012-01-12added was ist das sublab and ubucon presi to verein pageFlorian
2011-12-04moved phantomspeisung page to exploit rewrite rule on serverFlorian
2011-12-04added phantomspeisung pageFlorian
2011-12-03updated metadata for subconf subpageFlorian
2011-12-03added license information for subcponf photosFlorian
2011-12-03finished unfinished sentence in subconf articleFlorian
2011-12-03updated schedule and texts for subconf subpageFlorian
2011-12-02added subconf subpageFlorian
2011-11-30bug fix in projekte subpageFlorian
2011-11-30added first content to projekte pageFlorian
2011-11-30updated keyqords for projekte pageFlorian
2011-11-30updated englisch descripton for projekte pageFlorian
2011-11-30updated projekte description in germanFlorian
2011-11-30added projekte folderFlorian
2011-11-18Revert "Dachcam does not work anymore, remove"Christian Franke
2011-11-13added documents to verein subpageFlorian
2011-11-08changed style of webcam pageFlorian
2011-11-04added sublab logo to impressumFlorian
2011-11-04added was ist das sublab and ubucon presi to verein pageFlorian
2011-11-02News: moar newsChristian Franke