added filter to eventslist
Merge
super coole Filterungsmöglichkeit! |
viele Schönheitsreperaturen |
Tests auf volle Devise und cancan unterstützung umgstellt
add tranlations
Merge branch 'Clownfish' into dev
Merge pull request #113 from hpi-swt2/D/fix/eventroom

Fixed room-event-association
Merged Date and time to datetime field
added translations
Merge branch 'dev' into Clownfish

Conflicts:
	app/assets/javascripts/rooms.js
	app/assets/stylesheets/rooms.css
	app/models/event.rb
	db/schema.rb
ignoriere .orig Dateien
Merge branch 'Clownfish' into dev
Private gedöns
Revert "Private gedöns"

This reverts commit 0732cd87667783014639ffe4de49da6a8d94883e.
fix tests
fix tests
sry leute... Irgendwas mit den Migrations haut nicht hin :-(
local rspec finish without error - next try
changed events-date-schema
Merge origin/dev into dev