-
- Downloads
Merge remote-tracking branch 'origin/development_master' into development_master
# Conflicts: # gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ActivityFlowTest.java
No related branches found
No related tags found
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 2 additions, 2 deletions...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/controller/AnnotationController.java 11 additions, 2 deletions...f/modules/annotation/controller/AnnotationController.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/controller/FeedbackImpl.java 3 additions, 3 deletions...otsdam/gf/modules/annotation/controller/FeedbackImpl.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/model/AnnotationResponse.java 1 addition, 1 deletion...tsdam/gf/modules/annotation/model/AnnotationResponse.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/AssessmentDAO.java 109 additions, 5 deletions.../java/unipotsdam/gf/modules/assessment/AssessmentDAO.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/AssessmentProgress.java 6 additions, 6 deletions.../unipotsdam/gf/modules/assessment/AssessmentProgress.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/AssessmentView.java 22 additions, 0 deletions...java/unipotsdam/gf/modules/assessment/AssessmentView.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java 4 additions, 4 deletions...modules/assessment/controller/service/PeerAssessment.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/Group.java 4 additions, 0 deletions...chen/src/main/java/unipotsdam/gf/modules/group/Group.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/controller/SubmissionController.java 19 additions, 1 deletion...f/modules/submission/controller/SubmissionController.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java 5 additions, 2 deletions...potsdam/gf/modules/submission/view/SubmissionService.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/PeerAssessmentProcess.java 26 additions, 4 deletions...ain/java/unipotsdam/gf/process/PeerAssessmentProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/ProjectCreationProcess.java 5 additions, 0 deletions...in/java/unipotsdam/gf/process/ProjectCreationProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java 24 additions, 7 deletions...en/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskMapper.java 103 additions, 0 deletions...src/main/java/unipotsdam/gf/process/tasks/TaskMapper.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskMapping.java 54 additions, 44 deletions...rc/main/java/unipotsdam/gf/process/tasks/TaskMapping.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java 21 additions, 2 deletions...n/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskOrder.java 2 additions, 0 deletions.../src/main/java/unipotsdam/gf/process/tasks/TaskOrder.java
- gemeinsamforschen/src/main/webapp/WEB-INF/web.xml 1 addition, 0 deletionsgemeinsamforschen/src/main/webapp/WEB-INF/web.xml
- gemeinsamforschen/src/main/webapp/assessment/js/assessmentService.js 10 additions, 2 deletions...rschen/src/main/webapp/assessment/js/assessmentService.js
Loading
-
mentioned in issue #80 (closed)
-
mentioned in issue #81 (closed)
Please register or sign in to comment