Commit 413a998b authored 5 years ago by Martin Staehr

Merge remote-tracking branch 'origin/development_master' into hotfix-martin-ma

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java

parents 4efb7500 75ce9361

No related branches found

No related tags found

1 merge request!2Hotfix martin ma

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IGroupFinding.java 4 additions, 4 deletions

...src/main/java/unipotsdam/gf/interfaces/IGroupFinding.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/ContributionCategories.java 1 addition, 1 deletion

...s/assessment/controller/model/ContributionCategories.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java 3 additions, 10 deletions

...modules/assessment/controller/service/PeerAssessment.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java 3 additions, 3 deletions

...tsdam/gf/modules/assessment/controller/view/QuizView.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java 15 additions, 3 deletions

...n/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupView.java 8 additions, 3 deletions

.../src/main/java/unipotsdam/gf/modules/group/GroupView.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupfindingImpl.java 5 additions, 1 deletion

...in/java/unipotsdam/gf/modules/group/GroupfindingImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/preferences/groupal/JacksonPojoToJson.java 1 addition, 1 deletion

.../modules/group/preferences/groupal/JacksonPojoToJson.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/preferences/groupal/PGroupAlMatcher.java 17 additions, 1 deletion

...gf/modules/group/preferences/groupal/PGroupAlMatcher.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/controller/SubmissionController.java 35 additions, 23 deletions

...f/modules/submission/controller/SubmissionController.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/FullSubmission.java 8 additions, 8 deletions

...nipotsdam/gf/modules/submission/model/FullSubmission.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/FullSubmissionPostRequest.java 6 additions, 6 deletions

...f/modules/submission/model/FullSubmissionPostRequest.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java 29 additions, 16 deletions

...potsdam/gf/modules/submission/view/SubmissionService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java 4 additions, 4 deletions

...in/java/unipotsdam/gf/process/DossierCreationProcess.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/PeerAssessmentProcess.java 1 addition, 1 deletion

...ain/java/unipotsdam/gf/process/PeerAssessmentProcess.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/GroupFeedbackTaskData.java 9 additions, 9 deletions

...va/unipotsdam/gf/process/tasks/GroupFeedbackTaskData.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/Task.java 3 additions, 3 deletions

...schen/src/main/java/unipotsdam/gf/process/tasks/Task.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java 57 additions, 13 deletions

...en/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js 24 additions, 3 deletions

...schen/src/main/webapp/annotation/js/unstructuredUpload.js
gemeinsamforschen/src/main/webapp/project/create-project.jsp 1 addition, 1 deletion

gemeinsamforschen/src/main/webapp/project/create-project.jsp

with 234 additions and 114 deletions

Please register or to comment