-
- Downloads
Merge remote-tracking branch 'origin/development_master' into development_master
# Conflicts: # gemeinsamforschen/src/test/resources/database/fltrail.sql
No related branches found
No related tags found
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/controller/FeedbackImpl.java 15 additions, 10 deletions...otsdam/gf/modules/annotation/controller/FeedbackImpl.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Categories.java 12 additions, 0 deletions...am/gf/modules/assessment/controller/model/Categories.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/controller/SubmissionController.java 8 additions, 13 deletions...f/modules/submission/controller/SubmissionController.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/FullSubmission.java 2 additions, 2 deletions...nipotsdam/gf/modules/submission/model/FullSubmission.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/SubmissionPartPostRequest.java 8 additions, 8 deletions...f/modules/submission/model/SubmissionPartPostRequest.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/SubmissionProjectRepresentation.java 8 additions, 8 deletions...les/submission/model/SubmissionProjectRepresentation.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java 12 additions, 12 deletions...potsdam/gf/modules/submission/view/SubmissionService.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java 14 additions, 14 deletions...in/java/unipotsdam/gf/process/DossierCreationProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java 90 additions, 65 deletions...en/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
- gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp 2 additions, 4 deletions...rschen/src/main/webapp/annotation/annotation-document.jsp
- gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp 11 additions, 2 deletions...main/webapp/annotation/create-unstructured-annotation.jsp
- gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js 16 additions, 39 deletions...n/src/main/webapp/annotation/js/unstructuredAnnotation.js
- gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js 16 additions, 0 deletions...orschen/src/main/webapp/annotation/js/unstructuredRest.js
- gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js 1 addition, 18 deletions...schen/src/main/webapp/annotation/js/unstructuredUpload.js
- gemeinsamforschen/src/main/webapp/taglibs/js/utility.js 32 additions, 0 deletionsgemeinsamforschen/src/main/webapp/taglibs/js/utility.js
- gemeinsamforschen/src/test/resources/database/fltrail.sql 3 additions, 16 deletionsgemeinsamforschen/src/test/resources/database/fltrail.sql
- gemeinsamforschen/visio/activities.vsdx 0 additions, 0 deletionsgemeinsamforschen/visio/activities.vsdx
Loading
Please register or sign in to comment