- Jun 16, 2019
-
-
Martin Staehr authored
# Conflicts: # gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ActivityFlowTest.java
-
Martin Staehr authored
-
- Jun 14, 2019
-
-
Julian Dehne authored
-
Julian Dehne authored
-
wiepke authored
-
wiepke authored
-
wiepke authored
-
Martin Staehr authored
portfolio module
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
-
Martin Staehr authored
-
Julian Dehne authored
Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master
-
Julian Dehne authored
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
-
wiepke authored
-
Julian Dehne authored
- continued with peer assessment process
-
- Jun 13, 2019
-
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java # gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
-
Julian Dehne authored
# Conflicts: # gemeinsamforschen/src/main/webapp/project/js/tasks.js
-
Julian Dehne authored
- continued with peer assessment process
-
wiepke authored
-
Julian Dehne authored
Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master
-
Julian Dehne authored
- continued with peer assessment process
-
wiepke authored
-
wiepke authored
-
- Jun 12, 2019
-
-
Julian Dehne authored
Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master
-
Julian Dehne authored
- refactored FileManagement a bit - added uplooad presentation and final report
-
wiepke authored
-
wiepke authored
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/controller/SubmissionController.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/FullSubmissionPostRequest.java # gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java # gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
-
wiepke authored
-
Julian Dehne authored
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
-
- Jun 11, 2019
-
-
Martin Staehr authored
-
wiepke authored
-
Julian Dehne authored
-
- Jun 10, 2019
-
-
Martin Staehr authored
-
- Jun 09, 2019
-
-
Martin Staehr authored
the task for optional porfolio entries was just created for user uploading the dossier. now it is created for the whole group
-
Martin Staehr authored
-
Martin Staehr authored
-
- Jun 07, 2019
-
-
Martin Staehr authored
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskOrder.java
-
