Commit Graph

678 Commits

Author SHA1 Message Date
Thomas Blazek
7b5c39616a Fixed info 2013-11-12 09:52:04 +01:00
Andreas Stephanides
0bb8460ca4 info ... 2013-11-11 20:42:07 +01:00
Andreas Stephanides
d4b7446cdb Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-11-11 20:25:07 +01:00
Andreas Stephanides
ae99841306 Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	Gemfile.lock
2013-11-11 20:04:08 +01:00
Andreas Stephanides
f3288d5b69 production environment compile online 2013-11-11 20:03:00 +01:00
Andreas Stephanides
0827796e54 themen sortieren 2013-11-11 20:00:52 +01:00
Thomas Blazek
d314a81268 introduced lva.full_name and rewrote displays 2013-11-07 09:52:45 +01:00
Thomas Blazek
6f92241840 lva->typ_name gibt typ + ' ' + name zurück 2013-11-06 12:31:14 +01:00
Thomas Blazek
6509a51eb3 Modulgruppe->show fixed
Switched to pretty toolbar
2013-11-06 10:08:52 +01:00
Andreas Stephanides
1efb5a2967 Merge branch 'master' of github.com:fetsite/fetsite 2013-11-05 10:36:11 +01:00
Andreas Stephanides
663da5422f Gremienliste anzeigen erlauben 2013-11-05 10:35:39 +01:00
Thomas Blazek
329d9f4072 Merge branch 'master' of github.com:fetsite/fetsite 2013-11-05 09:25:28 +01:00
Thomas Blazek
cf5221ad7e Placed Login under Sidebar (permanent and easy to see 2013-11-05 09:24:17 +01:00
Andreas Stephanides
92d0a28a4c Merge branch 'master' of github.com:fetsite/fetsite 2013-11-04 18:46:29 +01:00
Andreas Stephanides
8d477cba3e sanitize gem 2013-11-04 18:45:38 +01:00
Andreas Stephanides
8ece6d4d1c header farbe 2013-11-04 18:45:30 +01:00
Andreas Stephanides
80736026af kein h1 button für tinymce 2013-11-04 18:45:04 +01:00
Andreas Stephanides
beef5bb953 first_words bei desc von studien
die ersten Worte der Beschreibung..
2013-11-04 18:44:44 +01:00
Thomas Blazek
47c58827c8 Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-11-04 15:35:53 +01:00
Andreas Stephanides
635afb7815 tinymce heading plugin 2013-11-02 13:07:41 +01:00
Andreas Stephanides
0eeafa6ef2 tabs fuer fetprofile 2013-11-02 13:07:00 +01:00
Andreas Stephanides
f46bae52dc Delete button fetprofiles removed 2013-11-01 23:10:07 +01:00
Andreas Stephanides
00d6fe0e21 small design changes 2013-11-01 23:09:48 +01:00
Thomas Blazek
f739d1ced7 lva name fix 2013-10-29 11:23:20 +01:00
Andreas Stephanides
affdc00047 remove debug from sessopnm 2013-10-28 14:35:50 +01:00
Andreas Stephanides
ef7deacec7 disable whitelist protection + seeds 2013-10-28 12:37:34 +01:00
Andreas Stephanides
fb48878b5e Merge branch 'master' of http://github.com/andreassteph/fetsite 2013-10-28 11:25:50 +01:00
Andreas Stephanides
637fe7dc9f G 2013-10-28 11:25:29 +01:00
Andreas Stephanides
1d16b2f87a gem seed_dump 2013-10-27 17:12:50 +01:00
Andreas Stephanides
943c510086 usercontroller 2013-10-27 17:12:24 +01:00
Andreas Stephanides
1058709b38 omniauth_secrets.example 2013-10-26 14:14:49 +02:00
Andreas Stephanides
6c6d1bef33 Startseite Beta 2013-10-26 14:12:18 +02:00
Andreas Stephanides
d178fbcc8d Lizenz 2013-10-26 14:12:06 +02:00
Andreas Stephanides
7e5b8b187e gemfile 2013-10-26 12:49:53 +02:00
Andreas Stephanides
678e861e10 fix Useradmin Liste 2013-10-26 12:49:47 +02:00
Andreas Stephanides
cd0e19b294 debug login 2013-10-26 12:49:14 +02:00
Andreas Stephanides
ff7c1d71bb Aktivere Rechtemanagement für einige Controller 2013-10-26 12:49:03 +02:00
Andreas Stephanides
37ee03676e add ldap support
Achtung dieses diff benötigt einen neuen Eintrag im secrets config file
2013-10-26 12:48:40 +02:00
Andreas Stephanides
91d0e4cf75 Studium 2013-10-13 13:30:30 +02:00
Thomas Blazek
8b0186b4b4 Beispiele on startpage / beispiele kosmetik 2013-10-06 18:51:33 +02:00
Andreas Stephanides
4b133db8ee FIX neuigkeit datum_nilsave 2013-10-04 16:16:25 +02:00
Andreas Stephanides
2e01fd574b calentries -neuigkeiten calender fix 2013-10-04 16:11:36 +02:00
Thomas Blazek
0fe92a4b48 css contentbox 2013-10-02 10:03:28 +02:00
Thomas Blazek
81fdda6248 Global Stylesheet contentbox 2013-10-01 12:33:25 +02:00
Andreas Stephanides
56798bdc4c studien index li-Element 2013-09-30 21:23:16 +02:00
Andreas Stephanides
ae2741ecb0 studium + picture 2013-09-30 21:18:42 +02:00
Andreas Stephanides
2c91a8db7e studium +picture new Layout 2013-09-30 21:18:04 +02:00
Andreas Stephanides
5c4bc925e6 thema linked tu gremium 2013-09-30 21:17:35 +02:00
Andreas Stephanides
46489efe45 WienKarte in public Ordner 2013-09-29 20:49:12 +02:00
Andreas Stephanides
fa92d696d4 themengruppe -> linkbox 2013-09-26 17:27:44 +02:00