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

..

application_controller.rb

Merge branch 'master' of https://github.com/andreassteph/fetsite

2013-07-22 15:49:49 +02:00

beispiele_controller.rb

Merge remote-tracking branch 'thomasb/master'

2013-08-12 11:11:59 +02:00

calendars_controller.rb

Calendar Klasse überarbeitet Views,gefixt, Pictures hinzugefügt

2013-08-11 01:17:37 +02:00

calentries_controller.rb

simple_calendar, calender_show_view

2013-08-08 09:09:34 +02:00

config_controller.rb

Init

2013-07-22 15:49:19 +02:00

home_controller.rb

Init

2013-07-22 15:49:19 +02:00

lvas_controller.rb

Lva-show überarbeitet

2013-08-11 11:27:37 +02:00

modulgruppen_controller.rb

Formatierungen

2013-08-09 16:17:51 +02:00

moduls_controller.rb

Topbar inclusions

2013-08-04 18:37:34 +02:00

neuigkeiten_controller.rb

Init

2013-07-22 15:49:19 +02:00

rubriken_controller.rb

Init

2013-07-22 15:49:19 +02:00

semesters_controller.rb

Semesters edit überarbeitet

2013-08-11 00:35:23 +02:00

studien_controller.rb

kleiner bugfix, layout

2013-08-10 00:58:09 +02:00

users_controller.rb

Init

2013-07-22 15:49:19 +02:00