summaryrefslogtreecommitdiff
path: root/public
AgeCommit message (Collapse)Author
2012-04-01April foolChristian Franke
2012-03-05optimized flyer name for downloadFlorian
2012-03-05renamed flyer imageFlorian
2012-03-05added maerz flyer to webpage termine pageFlorian
2012-02-06added rapman picturesFlorian
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 link and file: einzugsermaechtigung.pdfLutz Ballaschke
2012-01-12added onewire thumbnailFlorian
2012-01-12Revert "added tempgraph images, to be replaces when script is running"Christian Franke
This reverts commit 789067d7da9053f443bc5d7cd816500b8a246057.
2012-01-12added braeter imageFlorian
2012-01-12added onewire imagesFlorian
2012-01-12added tempgraph images, to be replaces when script is runningFlorian
2012-01-12added wotorwoerld imagesFlorian
2012-01-12added digitemp screenshotFlorian
2012-01-12added phantomspeisung pictures in subfolderFlorian
2012-01-12added westpaket imagesFlorian
2012-01-12added westpaket imagesFlorian
2012-01-12added small versions of the subconf imagesFlorian
2012-01-12added subconf imagesFlorian
2012-01-12add newspost about sfp moduleChristian Franke
2012-01-12modified sublab css for member display in status monitorFlorian
2012-01-12renamed vereinsdokumenteFlorian
2012-01-12added beitrttsantragFlorian
2012-01-12added sachspendenquittungFlorian
2012-01-12added geldspendenquittungFlorian
2012-01-12added satzungFlorian
2012-01-12added geschaeftsordnungFlorian
2012-01-12css bugfixFlorian
2012-01-12removed faces from klub analog.jpgFlorian
2012-01-12added preview image of klub_analogFlorian
2012-01-12added club analog imageFlorian
2012-01-12added sublab logo to repoFlorian
2012-01-12added wasistdassublab imageFlorian
2012-01-12added presi imageFlorian
2012-01-12Aeroponie newsBenjamin Kiessling
2011-12-05added digitemp screenshotFlorian
2011-12-04added phantomspeisung pictures in subfolderFlorian
2011-12-03added westpaket imagesFlorian
2011-12-03added westpaket imagesFlorian
2011-12-02added small versions of the subconf imagesFlorian
2011-12-02added subconf imagesFlorian
2011-11-20add newspost about sfp moduleChristian Franke
2011-11-13modified sublab css for member display in status monitorFlorian
2011-11-13renamed vereinsdokumenteFlorian
2011-11-13added beitrttsantragFlorian
2011-11-13added sachspendenquittungFlorian
2011-11-13added geldspendenquittungFlorian
2011-11-13added satzungFlorian
2011-11-13added geschaeftsordnungFlorian