-
- Downloads
Merge branch 'development_master' of...
Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
No related branches found
No related tags found
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 26 additions, 7 deletions...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IReflexionService.java 1 addition, 1 deletion...main/java/unipotsdam/gf/interfaces/IReflexionService.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/AssessmentDAO.java 19 additions, 3 deletions.../java/unipotsdam/gf/modules/assessment/AssessmentDAO.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/reflection/service/ReflexionService.java 2 additions, 2 deletions...tsdam/gf/modules/reflection/service/ReflexionService.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/Visibility.java 23 additions, 4 deletions...va/unipotsdam/gf/modules/submission/model/Visibility.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java 12 additions, 3 deletions...potsdam/gf/modules/submission/view/SubmissionService.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java 8 additions, 6 deletions...in/java/unipotsdam/gf/process/DossierCreationProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/DummyExecutionProcess.java 1 addition, 1 deletion...ain/java/unipotsdam/gf/process/DummyExecutionProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/ExecutionProcess.java 103 additions, 25 deletions...src/main/java/unipotsdam/gf/process/ExecutionProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/IExecutionProcess.java 1 addition, 1 deletion...rc/main/java/unipotsdam/gf/process/IExecutionProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/PeerAssessmentProcess.java 12 additions, 6 deletions...ain/java/unipotsdam/gf/process/PeerAssessmentProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/ReflexionProcess.java 22 additions, 0 deletions...src/main/java/unipotsdam/gf/process/ReflexionProcess.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/phases/PhasesImpl.java 4 additions, 7 deletions...rc/main/java/unipotsdam/gf/process/phases/PhasesImpl.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java 62 additions, 23 deletions...en/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java 26 additions, 5 deletions...n/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskOrder.java 2 additions, 1 deletion.../src/main/java/unipotsdam/gf/process/tasks/TaskOrder.java
- gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp 26 additions, 11 deletions...rc/main/webapp/annotation/upload-unstructured-dossier.jsp
- gemeinsamforschen/src/main/webapp/project/js/tasks.js 8 additions, 1 deletiongemeinsamforschen/src/main/webapp/project/js/tasks.js
- gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp 7 additions, 4 deletionsgemeinsamforschen/src/main/webapp/project/tasks-docent.jsp
- gemeinsamforschen/src/main/webapp/taglibs/css/unstructured-upload.css 34 additions, 0 deletions...schen/src/main/webapp/taglibs/css/unstructured-upload.css
Loading
Please register or sign in to comment