Commit Graph

979 Commits

Author SHA1 Message Date
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
Andreas Stephanides
de77bce5ca order beispiel 2014-10-19 15:41:31 +02:00
Andreas Stephanides
71d1595bac remove refresh button 2014-10-19 15:41:08 +02:00
Andreas Stephanides
327ee73c7a Remove Gemfile.lock 2014-10-17 10:24:48 +02:00
c64e2f9e5a merge fiy 2014-10-17 10:21:04 +02:00
Andreas Stephanides
46490d73bf Merge branch 'master' of github.com:andreassteph/fetsite 2014-10-17 10:18:00 +02:00
Andreas Stephanides
9007cb33c5 header studium show seitentitel 2014-10-17 10:17:24 +02:00
Andreas Stephanides
0aa28cf26c small fix neue verknüpfung dialog 2014-10-17 10:17:24 +02:00
Andreas Stephanides
47dd9d78dc remove wiki gems 2014-10-17 10:17:24 +02:00
Andreas Stephanides
d083d00bbb rmeove wiki 2014-10-17 10:17:24 +02:00
Andreas Stephanides
fcc2c5105c glock 2014-10-17 10:17:24 +02:00
Andreas Stephanides
6639011968 thmen sanitize 2014-10-17 10:17:24 +02:00
Andreas Stephanides
a785cc0bc5 beispielcontroller fix :show_comments 2014-10-17 10:17:24 +02:00
Andreas Stephanides
116d0562d9 removecomments 2014-10-17 10:17:24 +02:00
Andreas Stephanides
1f2cc5d202 meta tags neuigkeit 2014-10-17 10:17:24 +02:00
Andreas Stephanides
a8dd419f9e pagination update 2014-10-17 10:17:24 +02:00
Andreas Stephanides
fc48959e48 nlink fix 2014-10-17 10:17:23 +02:00
Andreas Stephanides
a65f1a8926 lva paper_trail fix 2014-10-17 10:17:23 +02:00
Andreas Stephanides
c40804b5cb membership gremium scope 2014-10-17 10:17:23 +02:00