Commits · d03e1fc63b86c3fbdc6a1ef4fc3ba5b6443da50f · fides / fltrail

May 28, 2019
- 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
- input für groupal und random verändert von groupsize 3 zu gruppengröße = n - n+1 · c0eaa918
  Julian Dehne authored 5 years ago
  
  c0eaa918
May 15, 2019

assessment for contributions works from download to upload. Calculating a mean... · 67ef0d2b

wiepke authored 5 years ago

assessment for contributions works from download to upload. Calculating a mean for docent-view and the docent-view itself is missing.

67ef0d2b

May 14, 2019
- Assessment update · 78903f83
  wiepke authored 5 years ago
  
  78903f83
- maven-repair. deleted conflicting POI-versions · dfc1afee
  wiepke authored 5 years ago
  
  dfc1afee
- rate Contributions was started to get implemented · d56c428a
  wiepke authored 5 years ago
  
  d56c428a
May 08, 2019
- Merge branch 'development_master' into hotfix-martin-ma · c200a122
  Martin Staehr authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/fileManagement/FileManagementService.java # gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java
  c200a122
- Merge remote-tracking branch 'gitup/development_master' into development_master · 37f9e265
  wiepke authored 5 years ago
  
  37f9e265
- Merge remote-tracking branch 'gitup/development_master' into development_master · 5a84931e
  wiepke authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp # gemeinsamforschen/src/main/webapp/project/delete-project.jsp
  5a84931e
- Merge branch 'issue63' into 'development_master' · b1933370
  Martin Stähr authored 5 years ago
  
  Fix issue 63 Closes #63 See merge request dehne/fltrail!1
  b1933370
- update some assessment classes. deleting studentidentifier · 70e011c1
  wiepke authored 5 years ago
  
  70e011c1
- adding correct path to save pdf from html, fix bug if image is added · 11119948
  Martin Staehr authored 5 years ago
  
  11119948
- styling annotations · fb64c5cb
  Maren Schulze authored 5 years ago
  
  fb64c5cb
- fix: save pdf in the right folder; fix: unique filenames for multiple Uploaded dossiers · b594bd52
  Martin Staehr authored 5 years ago
  
  b594bd52
- Merge branch 'development_master' into hotfix-martin-ma · b7f9a43e
  Martin Staehr authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/fileManagement/fileManagementView.java
  b7f9a43e
- fix merge error · 4d6db9b9
  Martin Staehr authored 5 years ago
  
  4d6db9b9
- fix merge error · 045bec60
  Martin Staehr authored 5 years ago
  
  045bec60
May 07, 2019
- some css and html changes · 5e0431d2
  Maren Schulze authored 5 years ago
  
  5e0431d2
May 02, 2019
- upload dossier as pdf. not as docx yet · e6dc1ff3
  wiepke authored 5 years ago
  
  e6dc1ff3
- fixed issue#55 · cd06da21
  wiepke authored 5 years ago
  
  cd06da21