Commit Graph

1099 Commits

Author SHA1 Message Date
0df979b7b7 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 22:09:49 +02:00
Andreas Stephanides
a337e2a589 host request fix2 2014-10-19 22:09:34 +02:00
98c600bc22 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 22:07:36 +02:00
Andreas Stephanides
4d34375cdc request host -> controller news_mailer 2014-10-19 22:04:06 +02:00
95b6028066 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 22:02:17 +02:00
Andreas Stephanides
7247d67a64 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2014-10-19 21:59:29 +02:00
Andreas Stephanides
e548933cbd neuigkeit thumb 2014-10-19 21:59:11 +02:00
Andreas Deutschmann
d321123d49 Fix Gremien Überschrift ohne Beschreibungen 2014-10-19 21:57:51 +02:00
Andreas Deutschmann
309d10bc39 Gremien "Alle Gremien" entfernt 2014-10-19 21:41:14 +02:00
Andreas Stephanides
3254cc86e8 sort & paginate nlinks @ gremium 2014-10-19 21:04:38 +02:00
a6f8c453ab Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 20:47:03 +02:00
e705e5a563 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 20:45:47 +02:00
Andreas Stephanides
8a93f460ca default startpage 2014-10-19 20:41:22 +02:00
Andreas Stephanides
5b81cbcdad blue1 startpage 2014-10-19 20:39:21 +02:00
Andreas Stephanides
2b09735989 lva typ PR 2014-10-19 20:39:00 +02:00
Andreas Stephanides
6343896744 showversions, Neuigkeit 2014-10-19 19:50:24 +02:00
Andreas Stephanides
7436c5c01e rechte für actions versions neuigkeiten 2014-10-19 19:49:33 +02:00
Andreas Stephanides
ad751c0837 button ausblenden wenn nicht eingeloggt 2014-10-19 19:29:29 +02:00
a6a34f5974 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 19:25:56 +02:00
Andreas Stephanides
96ef48cb31 is updated button für themen 2014-10-19 19:25:34 +02:00
dfcfc8892e Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 18:43:02 +02:00
Andreas Stephanides
fd248947f1 add semester 2014-10-19 18:42:25 +02:00
88249c1771 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 17:59:36 +02:00
Andreas Stephanides
faf3151de0 lva Beispiele translate 2014-10-19 17:59:19 +02:00
6f1e819482 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 17:50:06 +02:00
Andreas Stephanides
caa6c0ee4a html fix lva semester 2014-10-19 17:46:10 +02:00
d48e9fe026 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 17:44:03 +02:00
Andreas Stephanides
ba8b7920ea lva semester fix 2014-10-19 17:43:47 +02:00
7581ee99e2 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 17:39:10 +02:00
Andreas Stephanides
9cbe9942e3 modulname fix 2014-10-19 17:38:47 +02:00
6cbb761fc7 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 17:36:30 +02:00
Andreas Stephanides
6613df4b55 lvamodul_fix 2014-10-19 17:36:03 +02:00
9cf06cc02f Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 17:16:56 +02:00
Andreas Stephanides
4fd089a096 fix lva show 2014-10-19 17:16:38 +02:00
ee40680230 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 17:10:56 +02:00
Andreas Stephanides
2de81b5cc7 translate lva 2014-10-19 17:10:04 +02:00
Andreas Stephanides
1394dfc58c rm gemfile.lock 2014-10-19 17:00:05 +02:00
cea69a84fb Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 16:35:42 +02:00
Andreas Stephanides
e81c263ba0 is_wiki fix thmen 2014-10-19 16:35:23 +02:00
b8013a47fd merge gemfile.lock 2014-10-19 16:30:04 +02:00
Andreas Stephanides
55b8e17242 datum vom bsp 2014-10-19 16:29:09 +02:00
a696da2fa2 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-10-19 16:17:38 +02:00
Andreas Stephanides
e7ffb850d5 calentry edit 2014-10-19 16:16:55 +02:00
Andreas Stephanides
e7bc4276db beispielform 2014-10-19 16:16:00 +02:00
74c1877500 Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	Gemfile.lock
2014-10-19 16:04:38 +02:00
Andreas Stephanides
2fbd277e21 can manage lecturer 2014-10-19 16:03:58 +02:00
a40e5307bf Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	Gemfile.lock
2014-10-19 15:45:59 +02:00
Andreas Stephanides
94d9653ae2 neuigkeiten show fix 2014-10-19 15:44:19 +02:00
Andreas Stephanides
64f6c86e0f modulgruppen / semesteransicht 2014-10-19 15:42:08 +02:00
Andreas Stephanides
d609b4a5ff metatag neuigkeit 2014-10-19 15:41:50 +02:00