gitignore add
change description to text type |
style corrections
Merge branch 'Clownfish' of https://github.com/hpi-swt2/event-und-raumplanung into dev
Merge branch 'dev' into Clownfish
Revert "Merge branch 'dev' into Clownfish"

This reverts commit 1071399d953e003e5e3d5bfb3763db4edad1c36f, reversing
changes made to 526299258e28468887cf63d69edf4c1bd6dab36c.
updated schema.rb
Only owners can delete, edit and update their events
Schönheitsanpassungen für event new/edit
Rooms can now be selected using a multiselection input field
Merge branch 'c/feature/#35' into Clownfish
fixed some little bugs
fixed the tests
added filter to eventslist
Merge
Merge pull request #112 from hpi-swt2/Dolphins

merge Dolphins into dev (ready for approval)
Merge branch 'Clownfish' into dev
super coole Filterungsmöglichkeit! |
viele Schönheitsreperaturen |
Tests auf volle Devise und cancan unterstützung umgstellt
Small fixes for #12
add tranlations
Merge branch 'Clownfish' into dev