Commit Graph

67 Commits

Author SHA1 Message Date
Andreas Stephanides
7c180080ef AutoCommit Mon Aug 10 14:03:05 CEST 2015 2015-08-10 14:03:05 +02:00
Andreas Stephanides
3835c0e773 AutoCommit Mon Aug 10 13:03:04 CEST 2015 2015-08-10 13:03:04 +02:00
74e39f45d6 smallfix 2015-06-25 16:33:51 +02:00
Andreas Stephanides
b9d436789c beispiel ability cache fix 2015-06-24 11:17:15 +02:00
Andreas Stephanides
ef4bfa4012 AutoCommit Son Jun 21 01:03:01 CEST 2015 2015-06-21 01:03:01 +02:00
Andreas Stephanides
5a7eb23a1f studium form update 2015-05-28 20:17:36 +02:00
8de4946109 fix lva & crawlobject 2015-05-13 11:26:43 +02:00
Andreas Stephanides
224f2c6f83 tiss link 2015-04-22 18:43:32 +02:00
Andreas Stephanides
ee137959c4 addcrawlobjects 2015-04-01 00:01:41 +02:00
Andreas Stephanides
bd7aac9bb7 lvs fix 2015-03-30 16:53:00 +02:00
7000870853 Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	app/views/lvas/show.html.erb
2015-03-20 17:29:37 +01:00
3d11c09c26 fix lva view 2015-03-20 17:27:12 +01:00
Andreas Stephanides
044d7fc555 lva markup 2015-03-20 17:25:21 +01:00
Andreas Stephanides
4833c8d679 beispiel cache key 2015-03-16 07:42:07 +01:00
Andreas Stephanides
6a785b55df cache key fix 2015-03-15 21:15:41 +01:00
Andreas Stephanides
351174bd17 cahce locale 2015-03-15 20:53:51 +01:00
Andreas Stephanides
8bf5583e00 caching fuer neuigkeiten and bsp 2015-03-06 16:41:08 +01:00
Andreas Stephanides
2688bca831 calentry inline form 2014-10-28 08:43:44 +01:00
Andreas Stephanides
88b1a53fc7 Rate Beispiele text 2014-10-21 13:28:59 +02:00
Andreas Stephanides
54a2aee4c3 translate lva 2014-10-20 16:10:37 +02:00
Andreas Stephanides
faf3151de0 lva Beispiele translate 2014-10-19 17:59:19 +02:00
Andreas Stephanides
4fd089a096 fix lva show 2014-10-19 17:16:38 +02:00
Andreas Stephanides
2de81b5cc7 translate lva 2014-10-19 17:10:04 +02:00
Andreas Stephanides
de77bce5ca order beispiel 2014-10-19 15:41:31 +02:00
Andreas Stephanides
fc48959e48 nlink fix 2014-10-17 10:17:23 +02:00
44a0dc2f98 voteable 2014-07-21 23:41:44 +05:30
e8252fbf16 Beispiele als ZIP Datei 2014-07-19 18:41:50 +05:30
38394df7c3 etforum link 2014-07-09 23:49:48 +05:30
0526ea71f2 lvas ueberarbeitet 2014-06-11 00:55:46 +05:30
67ccecaf51 #143
#143 fixed
themen fixed
2014-06-10 18:47:16 +05:30
Andreas Stephanides
69b5ebdaec LVA template update 2014-03-30 20:41:12 +02:00
Andreas Stephanides
07f53c59bc thema verwalten added 2014-03-29 12:43:08 +01:00
Andreas Stephanides
783b9f41c9 changes in lva und beispiele
change
2014-01-22 12:33:07 +01:00
Thomas Blazek
b2e79b5e97 bug fix again 2013-11-20 09:51:45 +01:00
Thomas Blazek
8b0186b4b4 Beispiele on startpage / beispiele kosmetik 2013-10-06 18:51:33 +02:00
Thomas Blazek
93667d4cea Beispiel überarbeitungen 2013-08-25 15:16:19 +02:00
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
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
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