Age | Commit message (Collapse) | Author | |
---|---|---|---|
2012-02-05 | changed topic to cancel all events | Florian | |
2012-02-03 | no phantomspeisung topic | Florian | |
2012-02-03 | Revert "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-02 | added newlines | kloschi klosch | |
2012-02-02 | removed == fragments | kloschi klosch | |
2012-02-02 | added streamlink | kloschi klosch | |
2012-02-02 | Merge branch 'master' of sublab.org:website | kloschi 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-23 | Update Topic | Benjamin Kiessling | |
2012-01-17 | Update topic | Benjamin Kiessling | |
2012-01-12 | Update topic | Benjamin Kiessling | |
2012-01-12 | Update topic | Benjamin Kiessling | |
2012-01-12 | added silvesterlounge to topic | Florian | |
2012-01-12 | delted wotorwoerld from topic | Florian | |
2012-01-12 | updated topic | Florian | |
2012-01-12 | updated topic for wotorwoerld | Florian | |
2012-01-12 | updatet topic for outside the box | Florian | |
2012-01-12 | updated topic | Florian | |
2012-01-12 | updated topic | Florian | |
2012-01-12 | stream added | a klosch | |
2012-01-12 | commented stream in topic | a klosch | |
2012-01-12 | added stream to sublounge @template/topic added br br | a klosch | |
2012-01-12 | added stream to sublounge @template/topic again | a klosch | |
2012-01-12 | added stream to sublounge @template/topic | a klosch | |
2011-12-08 | Merge branch 'master' of sublab.org:website | a klosch | |
Conflicts: template/topic/topic | |||
2011-12-08 | stream added | a klosch | |
2011-12-03 | updated topic | Florian | |
2011-11-30 | updated topic | Florian | |
2011-11-11 | commented stream in topic | a klosch | |
2011-11-10 | added stream to sublounge @template/topic added br br | a klosch | |
2011-11-10 | added stream to sublounge @template/topic again | a klosch | |
2011-11-10 | added stream to sublounge @template/topic | a klosch | |
2011-11-02 | Update topic | Christian Franke | |
2011-10-27 | Add livestream | Christian Franke | |
2011-10-08 | place new template script | Christian Franke | |