Commit Graph

826 Commits

Author SHA1 Message Date
63e4bf8f29 Merge branch 'wiki' 2014-06-04 23:09:26 +05:30
e34aefd603 Profile +geschlecht 2014-06-04 18:59:18 +05:30
bd073e0835 Wiki integriert in HP 2014-06-03 18:23:14 +05:30
3aacb1642f geburtstag 2014-05-29 17:33:16 +05:30
adfec2446e themengruppeprivate 2014-05-27 19:42:05 +05:30
13514317c9 fetprofileprivate data 2014-05-27 19:41:35 +05:30
79c6454588 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-05-08 15:55:14 +02:00
Andreas Stephanides
015bf132a9 neuigkeiten rechte abfrage bei gremien 2014-05-08 15:53:46 +02:00
4e8ac08ddb Merge branch 'master' of https://github.com/fetsite/fetsite 2014-05-02 18:56:37 +02:00
Andreas Stephanides
667f5b680e attachments view 2014-05-02 18:55:38 +02:00
Andreas Stephanides
ad704aacd5 größerer Editor 2014-05-02 18:55:26 +02:00
Andreas Stephanides
c713a44884 Intern Bereich 2014-05-02 18:54:50 +02:00
a7f78aa5da Merge branch 'master' of https://github.com/fetsite/fetsite 2014-04-25 16:43:43 +02:00
Andreas Stephanides
ef62b73b2d gremium search fix 2014-04-25 16:43:13 +02:00
3fc4664687 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-04-24 10:56:03 +02:00
Andreas Stephanides
73a2627cd3 link Profile und Gremien an neuigkeit 2014-04-23 17:15:59 +02:00
749cf1532d Merge branch 'master' of https://github.com/fetsite/fetsite 2014-04-18 13:14:14 +02:00
Andreas Stephanides
63f3b09a5d load rubriken 2014-04-18 13:13:39 +02:00
811e6348b6 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-04-18 13:04:30 +02:00
Andreas Stephanides
ae350f6d25 gremien filter fix + habils inzugefügt 2014-04-18 13:02:55 +02:00
124821515b Merge branch 'master' of https://github.com/fetsite/fetsite 2014-04-18 11:30:53 +02:00
Andreas Stephanides
b0448541b2 edit_lvas fix 2014-04-18 11:29:40 +02:00
Andreas Stephanides
a50a7c50f8 kontakt 2014-04-18 11:29:29 +02:00
Andreas Stephanides
4aafbd1831 fonts darkblue theme 2014-04-18 11:29:24 +02:00
Andreas Stephanides
78197f54b8 verschiedene Schriftarten css 2014-04-17 15:17:31 +02:00
Andreas Stephanides
65df35f6cc semester in lva edit 2014-04-17 15:14:51 +02:00
99b6f3968a Merge remote-tracking branch 'origin/master'
Conflicts:
	.gitignore
2014-04-13 15:55:25 +02:00
0cc90eb220 gitignore 2014-04-13 15:52:23 +02:00
48fcdc1d7e gemfile lock 2014-04-13 15:50:44 +02:00
Andreas Stephanides
b6e69925db webrick update 2014-04-12 18:03:48 +02:00
Andreas Stephanides
f96c3dee9a studium_edit_lvas added 2014-04-12 18:03:39 +02:00
Andreas Stephanides
7fff32bab1 getting started updated 2014-04-12 18:03:10 +02:00
Andreas Stephanides
079890b814 Merge remote-tracking branch 'thisisaname/master' 2014-04-12 12:29:30 +02:00
2a54145a52 back button studien 2014-04-11 14:58:15 +02:00
Sai
3b6a964ae6 add_favicon 2014-04-11 14:11:36 +02:00
5a4e6d5946 verdoppelung gelöscht
Verdoppelung in der Bildergalerie gelöst
2014-04-11 13:24:20 +02:00
Thomas Blazek
ae6125571f Deutsche flagge geändert 2014-04-11 13:10:37 +02:00
Andreas Stephanides
a64edc0d8d Merge branch 'master' of github.com:fetsite/fetsite 2014-04-11 13:04:27 +02:00
Andreas Stephanides
e56c1c3ce4 gemfile-lock ignore 2014-04-11 13:04:11 +02:00
Andreas Stephanides
40a34b44ca Merge branch 'master' of http://github.com/mleop/fetsite 2014-04-11 13:02:20 +02:00
Andreas Stephanides
e9be76d6e4 small fixes rubriken und themen 2014-04-11 13:02:00 +02:00
73bba9bc6f faqs oberfläche 2014-04-11 13:01:17 +02:00
68925c1463 Merge branch 'master' of http://github.com/fetsite/fetsite
gitignore conflikt behoben
2014-04-11 12:59:49 +02:00
Thomas Blazek
1ffbfe6306 Added en.png
For all locales, a flag by the same name should be present.
2014-04-11 12:52:54 +02:00
Sai
c226eb8613 added dropdown menu 2014-04-11 12:34:55 +02:00
838534887b gitignore 2014-04-11 12:07:20 +02:00
Sai
99492e9380 Merge branch 'master' of http://github.com/fetsite/fetsite 2014-04-11 11:54:49 +02:00
Andreas Stephanides
9b6907f4cb Merge branch 'master' of http://github.com/mleop/fetsite 2014-04-11 11:48:13 +02:00
4db3056e6a #96 fixed 2014-04-11 11:44:12 +02:00
Andreas Stephanides
a9cfc39bae lvas bei modulgruppen und studium hinzugefügt 2014-04-07 10:07:41 +02:00