Commits · b7202b947415475f6bfaf73f045dcccea09259fc · fides / fltrail

Jul 24, 2019
- tool works with just one group fix #115 · b7202b94
  wiepke authored 5 years ago
  
  b7202b94
- gruppenchat - header of chat is visible again · b2ee65af
  wiepke authored 5 years ago
  
  b2ee65af
- Merge remote-tracking branch 'gitup/development_master' into development_master · cd3d3857
  wiepke authored 5 years ago
  
  cd3d3857
- tooltip for locked actions, annotation to creating Dossier button added, link... · 116402e6
  wiepke authored 5 years ago
  
  tooltip for locked actions, annotation to creating Dossier button added, link added to see groups in "CONTACT_GROUP" task
  116402e6
- small stuff · ac4f5b7f
  Julian Dehne authored 5 years ago
  
  ac4f5b7f
Jul 23, 2019
- Merge remote-tracking branch 'gitup/development_master' into development_master · 4e085879
  Julian Dehne authored 5 years ago
  
  4e085879
- closes #171 · 56909fee
  Julian Dehne authored 5 years ago
  
  56909fee
- Merge remote-tracking branch 'gitup/development_master' into development_master · 96b91b65
  wiepke authored 5 years ago
  
  96b91b65
- marks are truncated as usual (.3 or .7) · abadb3ee
  wiepke authored 5 years ago
  
  abadb3ee
- Merge branch 'development_master' of... · f3df4569
  Julian Dehne authored 5 years ago
  
  Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master
  f3df4569
- fix my fix · 8036484e
  wiepke authored 5 years ago
  
  8036484e
- #171 , refactoring intelliJ-recommended code, blocking GIVE_FEEDBACK with Lock · 0c31d5eb
  wiepke authored 5 years ago
  
  0c31d5eb
Jul 22, 2019
- styling see feedback get feedback · ea7b1eed
  Maren Schulze authored 5 years ago
  
  ea7b1eed
- fixed problem with not updating task with internal assessment progress · c9e778bb
  Julian Dehne authored 5 years ago
  
  c9e778bb
- fixed problem with not updating task with internal assessment progress · b965f9db
  Julian Dehne authored 5 years ago
  
  b965f9db
- implemented Progress for Docent Group Assessment · 0754e812
  Julian Dehne authored 5 years ago
  
  0754e812
- solved sticky footer · 75b00eb5
  Maren Schulze authored 5 years ago
  
  75b00eb5
- Merge branch 'development_master' of... · 91c683f1
  Julian Dehne authored 5 years ago
  
  Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master
  91c683f1
- Implemented Evaluation Task for Dozent · b67ca5c7
  Julian Dehne authored 5 years ago
  
  Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/wizard/Wizard.java
  b67ca5c7
Jul 19, 2019
- wizard works with UTF8 · 94a0fdcd
  wiepke authored 5 years ago
  
  94a0fdcd
- Implemented Evaluation Task for Dozent · abd188c2
  Julian Dehne authored 5 years ago
  
  Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/wizard/Wizard.java
  abd188c2
- fix #167 , wizard tested / fixed with participation of one student · c3be36a7
  wiepke authored 5 years ago
  
  c3be36a7
- started evaluation process · aabcaa27
  Julian Dehne authored 5 years ago
  
  aabcaa27
Jul 18, 2019
- Merge remote-tracking branch 'gitup/development_master' into development_master · 1c0e2cbd
  wiepke authored 5 years ago
  
  1c0e2cbd
- wizard works without solving tasks in UI. some Styling stuff fixed · b11eec1b
  wiepke authored 5 years ago
  
  b11eec1b
- Merge remote-tracking branch 'origin/development_master' into development_master · 665ae5e7
  Martin Staehr authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/process/phases/PhasesImpl.java # gemeinsamforschen/src/test/resources/database/fltrail.sql
  665ae5e7
- #150 backend implementation for execution phase task flow --needs-testing · 7169e0de
  Martin Staehr authored 5 years ago
  
  7169e0de
Jul 17, 2019
- Merge remote-tracking branch 'gitup/development_master' into development_master · f4345977
  wiepke authored 5 years ago
  
  f4345977
- wizard Durchfuhrungsphase works · c69938de
  wiepke authored 5 years ago
  
  c69938de
- finished assassment part of wizard · 32c3e5ab
  Julian Dehne authored 5 years ago
  
  32c3e5ab
- Merge remote-tracking branch 'gitup/development_master' into development_master · 0e8050f5
  Julian Dehne authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/wizard/Wizard.java
  0e8050f5
- finished assassment part of wizard -- needs testing · 44dd998f
  Julian Dehne authored 5 years ago
  
  44dd998f
- Merge remote-tracking branch 'gitup/development_master' into development_master · 76c046e8
  wiepke authored 5 years ago
  
  76c046e8
- wizard annotation works, starting give_feedback · d80cd788
  wiepke authored 5 years ago
  
  d80cd788
- finished assassment part of wizard -- needs testing · c04c1fef
  Julian Dehne authored 5 years ago
  
  c04c1fef
Jul 16, 2019
- finished assassment part of wizard -- needs testing · 64751346
  Julian Dehne authored 5 years ago
  
  64751346
- Merge remote-tracking branch 'gitup/development_master' into development_master · 7e01849f
  wiepke authored 5 years ago
  
  7e01849f
- working on wizard annotateStuff · acaceb0d
  wiepke authored 5 years ago
  
  acaceb0d
- Merge remote-tracking branch 'gitup/development_master' into development_master · 7637ef75
  Julian Dehne authored 5 years ago
  
  7637ef75
- started implementing assessment generation · 45497505
  Julian Dehne authored 5 years ago
  
  45497505