Commit Graph

73 Commits

Author SHA1 Message Date
Andreas Stephanides
9e26c49f0e theme_anpassung 2014-01-15 13:47:35 +01:00
Andreas Stephanides
8e8c686f12 kürzen des texts in semesteransicht 2013-12-18 09:35:03 +01:00
Andreas Stephanides
7e148bf06a Merge branch 'master' of https://github.com/fetsite/fetsite 2013-11-13 14:33:31 +01:00
Andreas Stephanides
c72a5f5505 fix studium show 2013-11-13 14:32:59 +01:00
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
Thomas Blazek
d314a81268 introduced lva.full_name and rewrote displays 2013-11-07 09:52:45 +01:00
Andreas Stephanides
91d0e4cf75 Studium 2013-10-13 13:30:30 +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
2c91a8db7e studium +picture new Layout 2013-09-30 21:18:04 +02:00
Andreas Stephanides
1951549486 studium frame 2013-09-11 20:07:33 +02:00
Thomas Blazek
069cd4b763 locale und design 2013-08-23 17:24:15 +02:00
Thomas Blazek
ff4a14a350 show changes 2013-08-21 13:08:36 +02:00
Thomas Blazek
162781ac04 Bugfix in studien/verwalten 2013-08-21 12:12:34 +02:00
Thomas Blazek
18dfe60309 Designänderungen 2013-08-19 23:38:34 +02:00
Thomas Blazek
4e7c7c23dd Lecturer in verwalten eingefügt 2013-08-19 19:17:27 +02:00
Thomas Blazek
9c1eff6bec Form kosmetik 2013-08-19 17:59:29 +02:00
Thomas Blazek
52f7e0b9ba designänderung 2013-08-19 15:43:30 +02:00
Thomas Blazek
28d5f8b96a semester tweaks 2013-08-19 09:11:45 +02:00
Thomas Blazek
b1f9ec1c39 Abkürzungen zu Studien hinzugefügt 2013-08-13 17:22:29 +02:00
Thomas Blazek
e97f179c94 Bugfix 2013-08-12 13:52:36 +02:00
Thomas Blazek
96753c3fef Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
2013-08-12 13:44:47 +02:00
Thomas Blazek
2d82aa79f6 Merge branch 'master' into calendar 2013-08-12 13:31:47 +02:00
Thomas Blazek
501a4f3903 Views überarbeitet 2013-08-12 12:49:10 +02:00
Andreas Stephanides
4aca98c0f5 Merge remote-tracking branch 'thomasb/master'
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
2013-08-12 11:11:59 +02:00
Thomas Blazek
af2406b4a1 Merge branch 'master' into calendar
Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb
2013-08-11 11:44:58 +02:00
Thomas Blazek
0736320be6 Semesteransicht verbessert 2013-08-11 11:43:06 +02:00
Thomas Blazek
88ba8fa1c2 Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
2013-08-11 10:34:03 +02:00
Thomas Blazek
661783bcd1 Aus semesteransicht per link lvas zu semester hinzufügen /entfernen 2013-08-11 00:38:24 +02:00
Thomas Blazek
cd14b0dd52 Layout kleinigkeiten 2013-08-11 00:37:13 +02:00
Thomas Blazek
57a7e49a34 CSS changes 2013-08-10 22:47:32 +02:00
Andreas Stephanides
116446ff63 merge layout formular moduls & studien 2013-08-10 14:29:36 +02:00
Thomas Blazek
86913257af Layout changes 2013-08-10 02:03:45 +02:00
Thomas Blazek
9bf4768e09 Form designs 2013-08-09 18:49:56 +02:00
Thomas Blazek
b6671879fc Bug fix
Die persistent variables waren schlecht benannt. hab sie eindeutig
benannt
2013-08-09 18:49:30 +02:00
Thomas Blazek
61fc09bcf0 Formatierungen 2013-08-09 16:17:51 +02:00
Thomas Blazek
33c3fea2bc Formatierung 2013-08-08 15:23:12 +02:00
Thomas Blazek
5c36eb55a3 Verwaltungsübersicht 2013-08-07 22:07:20 +02:00
Thomas Blazek
a92ff60718 Verwaltung erste interessante version 2013-08-07 17:51:48 +02:00
Thomas Blazek
78f7a685b1 Verwaltung 2013-08-07 16:24:19 +02:00
Thomas Blazek
4ffc8fbea1 Studienverwaltung 2013-08-07 12:17:05 +02:00
Thomas Blazek
abf367b8e4 Studienansicht neu 2013-08-05 18:24:34 +02:00
Thomas Blazek
e3f7d7e472 Bearbeitung 2013-08-05 14:34:47 +02:00
Thomas Blazek
c3432dd1bc Layouts 2013-08-05 08:36:16 +02:00
Thomas Blazek
c72c186d62 Topbar layouts 2013-08-04 18:04:27 +02:00
Thomas Blazek
2b5a6edb3b Bugfixes 2013-08-02 19:08:35 +02:00
Thomas Blazek
005c28a273 Toolbar und kopfzeileneinbindung 2013-08-02 15:00:58 +02:00
Thomas Blazek
1c1b0cfe91 Einbau Toolbar 2013-08-02 12:46:18 +02:00