SprintRetrospective

07-05-2014
Verslag
Customer review

08-05-2014
.gitignore Calendar
Databasebestand

Alles wat imo overbodig was eruit gegooid, en nieuwe tabel
(Festivaleditie) toegevoegd.
?
Merge branch 'master' of https://github.com/utwente-di/di17
Genre2

Genre2 toegevoegd
Artiest - Festivaleditie

Artiest was eerst gekoppeld aan festival, dit is nu gekoppeld aan
festivaleditie.
Festivaleditieartiest

Extra tabel tussen festival en artiest
Dummydatabase

Shitload aan dummydata
schema.sql edit
Filterqueries

Voorlopige filterqueries, is nog niet met een variabele.
Merge remote-tracking branch 'origin/KalenderSetup'

Conflicts:
	Calendar/.classpath
	Calendar/.settings/org.eclipse.wst.common.component
	Calendar/bin/.gitignore
	Calendar/pom.xml
	Calendar/src/main/java/model/Artiest.java
	Calendar/src/main/java/model/Event.java
	Calendar/src/main/java/model/Festival.java
	Calendar/src/main/java/model/FestivalEditie.java
	Calendar/src/main/java/model/Gebruiker.java
	Calendar/src/main/java/model/Recensie.java
	Calendar/src/main/resources/bsh.jar
	Calendar/src/main/resources/calendar.jar
	Calendar/src/main/resources/commons-codec.jar
	Calendar/src/main/resources/commons-fileupload.jar
	Calendar/src/main/resources/commons-io.jar
	Calendar/src/main/resources/flashchart.jar
	Calendar/src/main/resources/slf4j-api.jar
	Calendar/src/main/resources/slf4j-jdk14.jar
	Calendar/src/main/resources/zcommon.jar
	Calendar/src/main/resources/zel.jar
	Calendar/src/main/resources/zhtml.jar
	Calendar/src/main/resources/zk.jar
	Calendar/src/main/resources/zkbind.jar
	Calendar/src/main/resources/zkplus.jar
	Calendar/src/main/resources/zul.jar
	Calendar/src/main/resources/zuljsp.jar
	Calendar/src/main/resources/zweb.jar
	Calendar/src/main/webapp/index.zul
	design/EER Diagram.mwb
	design/schema.sql
Merge branch 'master' of https://github.com/utwente-di/di17
update webapp
web.xml edit
Presentatie 2 stuff

eer diagram in png en pptx
Plaatjes & Co
settings
.settings