summaryrefslogtreecommitdiff
path: root/template/pages
AgeCommit message (Collapse)Author
2013-04-03Fix encoding?Christian Franke
2013-04-03Revert "Fixup? encoding"Christian Franke
This reverts commit 1ff7a80daaba7b8697ae04c20e2cb3856702164e.
2013-04-03Fixup? encodingChristian Franke
2013-03-31made fahrplan for cc13Florian
2013-03-20typo fix cryptocon13Florian
2013-03-20typo fixFlorian
2013-03-20added latest cryptocon versionFlorian
2013-03-10added announce text for cc13Florian
2013-03-09headline fix for cyptocon pageFlorian
2013-03-09minor design changes in cryptocon pageFlorian
2013-03-09added cryptocon pageFlorian
2013-03-05CryptoCon 2013Christian Koch
2013-02-18Techniksprechstunde ergaenztChristian Koch
2013-02-11Add SVG to gitChristian Franke
2013-01-06Don't announce sunday eventsChristian Franke
2012-09-21updated raeume page (new buero image)Florian
2012-09-21added uhr image to index pageFlorian
2012-09-21design fix in contact pageFlorian
2012-09-21moved impressum content to contact pageFlorian
2012-09-18rewrite of homepage (index)Florian
2012-09-18added new webcam to webpageFlorian
2012-09-16Add missing files for wiki templateChristian Franke
2012-09-16Add some stuff for the wikiChristian Franke
2012-09-16fixed typo in impressum pageFlorian
2012-09-04add image to lageChristian Franke
2012-08-16Fixup freifunk linkChristian Franke
2012-08-03fan notificationBenjamin Kiessling
2012-08-02Fix image pathBenjamin Kiessling
2012-08-02Include imageBenjamin Kiessling
2012-07-26Fix termin lhciiiBenjamin Kiessling
2012-07-18lhc iii pageBenjamin Kiessling
2012-07-14Remove Mai flyerBenjamin Kiessling
2012-06-24typoChristian Koch
2012-06-24Elektronikrunde addedChristian Koch
2012-05-20Fix LHCIII DatumBenjamin Kiessling
2012-05-05Termin Techniksprechstunde ergaenztChristian Koch
2012-05-02flyer maiChristian Franke
2012-04-12Fixup encoding, move telfone downChristian Franke
2012-04-01Flyer CSS hotfixDavid Lamparter
can't fix this properly, the CSS is used in many places and I don't know the design really
2012-04-01Flyer AprilDavid Lamparter
2012-03-18Add a mockup page for subconf 2Christian Franke
2012-03-05minor fixes in termine pageFlorian
2012-03-05optimized flyer name for downloadFlorian
2012-03-05Termine aufgeraeumtFlorian
2012-03-05added maerz flyer to webpage termine pageFlorian
2012-02-29changed some char displaz errorsFlorian
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