-
- Downloads
Merge remote-tracking branch 'origin/single-user-project' into single-user-project
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
No related branches found
No related tags found
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 2 additions, 7 deletions...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java 13 additions, 24 deletions...essment/controller/service/AssessmentDBCommunication.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java 7 additions, 3 deletions...modules/assessment/controller/service/PeerAssessment.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java 2 additions, 1 deletion...tsdam/gf/modules/assessment/controller/view/QuizView.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java 18 additions, 12 deletions...n/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
- gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js 2 additions, 2 deletions...orschen/src/main/webapp/annotation/js/unstructuredRest.js
- gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js 3 additions, 3 deletions...schen/src/main/webapp/annotation/js/unstructuredUpload.js
- gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp 20 additions, 28 deletions...rc/main/webapp/annotation/upload-unstructured-dossier.jsp
- gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp 90 additions, 290 deletionsgemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
- gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js 10 additions, 95 deletions...nsamforschen/src/main/webapp/assessment/js/assess-work.js
- gemeinsamforschen/src/main/webapp/project/tasks-student.jsp 0 additions, 127 deletionsgemeinsamforschen/src/main/webapp/project/tasks-student.jsp
- gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/AnnotationTest.java 12 additions, 4 deletions...rc/test/java/unipotsdam/gf/interfaces/AnnotationTest.java
- gemeinsamforschen/src/test/java/unipotsdam/gf/modules/annotation/FeedbackTest.java 0 additions, 42 deletions...t/java/unipotsdam/gf/modules/annotation/FeedbackTest.java
- gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java 13 additions, 1 deletion...a/unipotsdam/gf/modules/assessment/TestAddAssessment.java
- gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java.orig 0 additions, 161 deletions...potsdam/gf/modules/assessment/TestAddAssessment.java.orig
Loading
Please register or sign in to comment