Commits · 8e2ff6517f39024e5ae156fc54dcad09f7432456 · fides / fltrail

Jun 11, 2019
- added hook for peer assessment · 8e2ff651
  Julian Dehne authored 5 years ago
  
  8e2ff651
Jun 07, 2019
- erweitere Modellierung · 62ceed08
  Julian Dehne authored 5 years ago
  
  62ceed08
- adds optional portfolio activities and eportfolio activity · 8a2e1049
  Martin Stähr authored 5 years ago
  
  8a2e1049
Jun 06, 2019
- see-feedback follows after getting feedback from another group. · c62a0608
  wiepke authored 5 years ago
  
  c62a0608
- fixing minor issues on feedbackTasks · 4fa0a8c1
  wiepke authored 5 years ago
  
  4fa0a8c1
- fix finalizing of feedback · 44549b0b
  Martin Staehr authored 5 years ago
  
  44549b0b
Jun 05, 2019
- fixing minor issues on feedbackTasks · 1b61e717
  wiepke authored 5 years ago
  
  1b61e717
- give_feedback for the first time works · a6c9a4fb
  wiepke authored 5 years ago
  
  a6c9a4fb
Jun 04, 2019
- fix merge · e4a8603a
  wiepke authored 5 years ago
  
  e4a8603a
- Merge remote-tracking branch 'gitup/development_master' into development_master · 8aaab0a7
  wiepke authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/view/AnnotationService.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/controller/SubmissionController.java # gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java
  8aaab0a7
- feedback for Dossier works again · 20296526
  wiepke authored 5 years ago
  
  20296526
- remove unused code · 57f9cbb3
  Martin Staehr authored 5 years ago
  
  57f9cbb3
Jun 02, 2019
- add ability to feedback dossier; reimplementation of annotationApi/frontend #88 · 5abbc4cd
  Martin Staehr authored 5 years ago
  
  5abbc4cd
May 29, 2019
- Merge remote-tracking branch 'origin/development_master' into development_master · 50f772b0
  Martin Staehr authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/test/resources/database/fltrail.sql
  50f772b0
- formatting · 83a3d3d8
  Martin Staehr authored 5 years ago
  
  83a3d3d8
- Merge remote-tracking branch 'gitup/development_master' into development_master · 3d33cf28
  wiepke authored 5 years ago
  
  3d33cf28
- fixing merge and implementing groupTasks annotate, feedback, uploadDossier · eb028fe3
  wiepke authored 5 years ago
  
  eb028fe3
- fixing merge and implementing groupTasks annotate, feedback, uploadDossier · ffa72779
  wiepke authored 5 years ago
  
  ffa72779
May 28, 2019
- adding must-do portfolio entries to the visio diagrams · 8346c215
  Martin Stähr authored 5 years ago
  
  8346c215
- fixing the merge · d03e1fc6
  wiepke authored 5 years ago
  
  d03e1fc6
May 26, 2019
- fix logout error, adding contributionCategory to submission · a384a94d
  Martin Staehr authored 5 years ago
  
  a384a94d
- rename contributionCategories to contributionCategory · 1473cfb0
  Martin Staehr authored 5 years ago
  
  1473cfb0
- adding visio file to repo · 7698d642
  Martin Staehr authored 5 years ago
  
  7698d642
May 24, 2019
- change dossier page to be a little bit more dynamic · 4d2f867a
  Martin Staehr authored 5 years ago
  
  4d2f867a
- fix getQueryParameter Bug for multiple queryparameter in url · 939001da
  Martin Staehr authored 5 years ago
  
  939001da
- change naming of users in selenium file · c4ca1fd0
  Martin Staehr authored 5 years ago
  
  c4ca1fd0
- Merge branch 'hotfix-martin-ma' into 'development_master' · 87d336f8
  Martin Stähr authored 5 years ago
  
  Hotfix martin ma See merge request dehne/fltrail!2
  87d336f8
- fix merge errors · 7c5ed999
  Martin Staehr authored 5 years ago
  
  7c5ed999
- Merge remote-tracking branch 'origin/development_master' into hotfix-martin-ma · 413a998b
  Martin Staehr authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/view/SubmissionService.java
  413a998b
- implementing groupTasks for dossiers done · 75ce9361
  wiepke authored 5 years ago
  
  75ce9361
- Merge remote-tracking branch 'origin/development_master' into hotfix-martin-ma · 4efb7500
  Martin Staehr authored 5 years ago
  
  4efb7500
- #82 start implementing bug fix for indentation problem on pdfs · 58eeebf6
  Martin Staehr authored 5 years ago
  
  58eeebf6
May 23, 2019
- implementing groupTasks. Not quiet done yet · b08081a5
  wiepke authored 5 years ago
  
  b08081a5
May 22, 2019
- variable groupSize as inCardSolver in task.jsp . some bugfixes · 2fa25909
  wiepke authored 5 years ago
  
  2fa25909
- Merge remote-tracking branch 'gitup/flexibilatisierter_groupal' into development_master · 9e2a2367
  wiepke authored 5 years ago
  
  9e2a2367
- variable groupSize · 9513894c
  wiepke authored 5 years ago
  
  9513894c
May 21, 2019
- clickpath through groupformation · e24a212d
  wiepke authored 5 years ago
  
  e24a212d
May 17, 2019
- originalGroups persists in DB · af2d9737
  wiepke authored 5 years ago
  
  af2d9737
- fixing group_building_phase_end. beautify rateContribution. · 5750833b
  wiepke authored 5 years ago
  
  5750833b
May 16, 2019
- reimplement rocketChat. started assessmentProcess, closed small issue, enlarged task-list · 6df48c92
  wiepke authored 5 years ago
  
  6df48c92