Commit Graph

15 Commits

Author SHA1 Message Date
Andreas Stephanides
67c3fc8089 intend 2015-06-15 15:39:09 +02:00
Andreas Stephanides
5a7eb23a1f studium form update 2015-05-28 20:17:36 +02:00
2a54145a52 back button studien 2014-04-11 14:58:15 +02:00
Andreas Stephanides
1d2d3e791b Qualifikation #129
#129 closed
2014-03-25 19:41:48 +01:00
Andreas Stephanides
2c91a8db7e studium +picture new Layout 2013-09-30 21:18:04 +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
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
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
Andreas Stephanides
116446ff63 merge layout formular moduls & studien 2013-08-10 14:29:36 +02:00
Thomas Blazek
9bf4768e09 Form designs 2013-08-09 18:49:56 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
3d11400d5e GitHub Account angelegt 2013-02-12 02:05:12 +01:00