andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
243 Commits 7 Branches 0 Tags
d16f19f28f9ea14902c4d22ea707df7d082a9bd5
Commit Graph

52 Commits

Author SHA1 Message Date
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
Thomas Blazek
13e1c63561 Toolbar einbindungen 2013-08-02 10:40:22 +02:00
Thomas Blazek
0053a4de0c Einrückungen 2013-08-02 10:39:58 +02:00
Thomas Blazek
348037036a Weitere korrekturen Semester 2013-08-01 17:46:04 +02:00
Thomas Blazek
afd85d0bc0 Semesteransicht auf RESTful routes aufgebaut 2013-08-01 11:57:37 +02:00
Thomas Blazek
9d1b915cd4 Studien-views überarbeiten 2013-07-30 14:28:28 +02:00
Thomas Blazek
f2b8e354fe Umbenennung 2013-07-30 09:38:46 +02:00
Thomas Blazek
15f5b599ff Kosmetik 2013-07-29 21:10:40 +02:00
Thomas Blazek
4fedbe55b9 Optik semesteransicht 2013-07-29 19:46:31 +02:00
Thomas Blazek
5f45487d00 Semester "ohne zuordnung" 2013-07-29 18:42:44 +02:00
Thomas Blazek
d9618d5bba Semester vorläufig 2013-07-29 18:02:35 +02:00
Thomas Blazek
161598846a Introducing Semesters 2013-07-29 17:47:44 +02:00
Thomas Blazek
9195ac20e2 Sortierungen für index.hmtl angepasst 2013-07-25 13:44:31 +02:00
Thomas Blazek
0daedfe4c5 Modulgruppenkosmetik 2013-07-24 21:20:12 +02:00
Thomas Blazek
d8dab1d51a Translations for Rubriken 2013-07-22 16:17:30 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
d6ce165782 Neuigkeiten updateund lva 2013-03-24 00:53:30 +01:00
Andreas Stephanides
744fcfddb4 fixed toolbar helper 2013-03-19 04:58:53 +01:00
Andreas Stephanides
a712fc70f4 moduls 2013-03-18 23:07:41 +01:00
Andreas Stephanides
e254db7ae2 Studienliste keine Tabelle mehr 2013-02-13 00:57:54 +01:00
Andreas Stephanides
f2e2b1203f studien,modul views: internationalisierung und Navigation 2013-02-13 00:47:24 +01:00
Andreas Stephanides
cf33706320 fixed studien Ansicht und Modulgruppen 2013-02-12 23:51:43 +01:00