Commit d50bdef7 authored 6 years ago by Christian

Merge branch 'development_master' into PeerAssessmentChristian_2

# Conflicts:
#	gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
#	gemeinsamforschen/src/main/webapp/pages/project-docent.jsp

parents c5364829 13e8164f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/pom.xml 9 additions, 0 deletions

gemeinsamforschen/pom.xml
gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 12 additions, 1 deletion

...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java 2 additions, 2 deletions

.../src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/VereinfachtesResultSet.java 39 additions, 15 deletions

...otsdam/gf/core/database/mysql/VereinfachtesResultSet.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java 54 additions, 7 deletions

...in/java/unipotsdam/gf/core/management/ManagementImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java 18 additions, 1 deletion

...n/java/unipotsdam/gf/core/management/project/Project.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java 7 additions, 4 deletions

...rc/main/java/unipotsdam/gf/core/management/user/Menu.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java.orig 0 additions, 163 deletions

.../unipotsdam/gf/core/management/user/UserService.java.orig
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java 126 additions, 0 deletions

...n/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java 47 additions, 0 deletions

...rc/main/java/unipotsdam/gf/core/states/PhasesService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/ProjectPhase.java 6 additions, 0 deletions

...src/main/java/unipotsdam/gf/core/states/ProjectPhase.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/Feedback.java 9 additions, 0 deletions

...chen/src/main/java/unipotsdam/gf/interfaces/Feedback.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java 6 additions, 0 deletions

...rc/main/java/unipotsdam/gf/interfaces/ICommunication.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java 13 additions, 0 deletions

...chen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java 2 additions, 2 deletions

...c/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPhases.java 13 additions, 0 deletions

...schen/src/main/java/unipotsdam/gf/interfaces/IPhases.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReports.java 8 additions, 0 deletions

...c/main/java/unipotsdam/gf/interfaces/ResearchReports.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/controller/AnnotationController.java 22 additions, 17 deletions

...f/modules/annotation/controller/AnnotationController.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/model/Annotation.java 13 additions, 35 deletions

...va/unipotsdam/gf/modules/annotation/model/Annotation.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/model/AnnotationBody.java 69 additions, 0 deletions

...nipotsdam/gf/modules/annotation/model/AnnotationBody.java

with 475 additions and 247 deletions

Please register or to comment