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

43 Commits

Author SHA1 Message Date
Thomas Blazek
04b91b9f33 Lecturer in Lva eingebunden, Image thumb integriert 2013-08-21 13:48:49 +02:00
Thomas Blazek
ff4a14a350 show changes 2013-08-21 13:08:36 +02:00
Thomas Blazek
9c1eff6bec Form kosmetik 2013-08-19 17:59:29 +02:00
Thomas Blazek
f58c359d36 Introducing Lecturers 2013-08-19 15:43:54 +02:00
Thomas Blazek
b1f9ec1c39 Abkürzungen zu Studien hinzugefügt 2013-08-13 17:22:29 +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
7a452fa9c1 Formtastic css, Lva-typ änderungen 2013-08-12 11:58:27 +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
09dd4f65a0 Prüfungsinformationen und Typ zu lva hinzugefügt 2013-08-12 09:15:58 +02:00
Thomas Blazek
350dc6d8c2 Merge branch 'master' into calendar 2013-08-11 21:27:46 +02:00
Thomas Blazek
dfd99bec5f Prüfungsinformation und Lernaufwand zu Lva hinzugefügt 2013-08-11 21:25:18 +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
90b8aff78d lva view tweaks 2013-08-11 11:34:20 +02:00
Thomas Blazek
4f95770fa7 Lva-show überarbeitet 2013-08-11 11:27:37 +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
cd14b0dd52 Layout kleinigkeiten 2013-08-11 00:37:13 +02:00
Thomas Blazek
57a7e49a34 CSS changes 2013-08-10 22:47:32 +02:00
Thomas Blazek
585af6f162 Lva form verbessert 2013-08-09 14:15:02 +02:00
Thomas Blazek
78f7a685b1 Verwaltung 2013-08-07 16:24:19 +02:00
Thomas Blazek
abf367b8e4 Studienansicht neu 2013-08-05 18:24:34 +02:00
Andreas Stephanides
b990151bde Merge branch 'master' of https://github.com/andreassteph/fetsite 
Beispiel.lva bei neues Beispiel resolved
Conflicts:
	app/controllers/beispiele_controller.rb
 2013-08-05 14:55:55 +02:00
Andreas Stephanides
988efd9e6a Neues Beispiel Button 2013-08-05 14:54:31 +02:00
Thomas Blazek
eb2f14f18b div-layouts+bugfixes 2013-08-05 09:57:44 +02:00
Thomas Blazek
ef81b61260 Topbar inclusions 2013-08-04 18:37:34 +02:00
Thomas Blazek
c72c186d62 Topbar layouts 2013-08-04 18:04:27 +02:00
Thomas Blazek
05ed9da9c4 List views 2013-08-04 15:20:20 +02:00
Thomas Blazek
2b5a6edb3b Bugfixes 2013-08-02 19:08:35 +02:00
Thomas Blazek
c4a27d17f2 Kleinigkeiten 2013-08-02 16:54:55 +02:00
Thomas Blazek
005c28a273 Toolbar und kopfzeileneinbindung 2013-08-02 15:00:58 +02:00
Thomas Blazek
0053a4de0c Einrückungen 2013-08-02 10:39:58 +02:00
Thomas Blazek
bbaa9b89dd Kosmetik 2013-07-30 14:42:37 +02:00
Thomas Blazek
9d1b915cd4 Studien-views überarbeiten 2013-07-30 14:28:28 +02:00
Thomas Blazek
15f5b599ff Kosmetik 2013-07-29 21:10:40 +02:00
Thomas Blazek
161598846a Introducing Semesters 2013-07-29 17:47:44 +02:00
Thomas Blazek
4215882708 Einbindung von Beispielen 2013-07-25 16:58:10 +02:00
Thomas Blazek
b1525d86c2 Bugfix 2013-07-25 08:36:06 +02:00
Andreas Stephanides
66eef0f198 FIX: LVA Tiss Funktionen entfernt 
Alle Funktionen die TISS voraussetzen vorläufig entfernt,
HTML ShowTemplate gefixt
toolbar_html Helper verwendet
 2013-07-22 19:18:37 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
bcf90e2590 LVA Tiss Einbindung - erster Entwurf 2013-03-24 14:01:11 +01:00
Andreas Stephanides
19b4ed31f4 Beispiele hinzugefügt 2013-02-15 10:48:52 +01:00
Andreas Stephanides
f2e2b1203f studien,modul views: internationalisierung und Navigation 2013-02-13 00:47:24 +01:00
Andreas Stephanides
3d11400d5e GitHub Account angelegt 2013-02-12 02:05:12 +01:00