Commits · 2d2485be20caf1b4bb8f2d95919d55de73c78393 · fides / fltrail

Jul 07, 2019
- #143 #138 adding reflexion question catalog and learning goal catalog · 2d2485be
  Martin Staehr authored 5 years ago
  
  to database initialization process
  2d2485be
- #140 change implementation of answering reflection questions · 712668b6
  Martin Staehr authored 5 years ago
  
  answering all reflection questions in a row
  712668b6
Jul 05, 2019
- #140 implement reflection questions into submissions · dea228b4
  Martin Staehr authored 5 years ago
  
  dea228b4
- #113 fixing bug where student can see to much entries · 7588bb9c
  Martin Staehr authored 5 years ago
  
  7588bb9c
- #113 update database schema · 965286b8
  Martin Staehr authored 5 years ago
  
  965286b8
- adding reflection questions catalog · b3946314
  Martin Staehr authored 5 years ago
  
  b3946314
- #113 add ability to comment portfolio entries · f3514ce0
  Martin Staehr authored 5 years ago
  
  f3514ce0
Jul 02, 2019
- Merge remote-tracking branch 'origin/development_master' into development_master · 42de19a3
  Martin Staehr authored 5 years ago
  
  42de19a3
Jun 22, 2019
- Merge branch 'development_master' of... · 9f6e6bb4
  Julian Dehne authored 5 years ago
  
  Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master
  View commits for tag version_0.1 version_0.1
  
  9f6e6bb4
- Merge remote-tracking branch 'gitup/development_master' into development_master · cb4301b4
  wiepke authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/webapp/project/js/tasks.js
  cb4301b4
- working on issue #125 · ba5d24f1
  wiepke authored 5 years ago
  
  fix issue #128
  ba5d24f1
- working on issue #125 · 556ad759
  wiepke authored 5 years ago
  
  fix issue #104
  556ad759
- references #125 · ee4e0c30
  Julian Dehne authored 5 years ago
  
  ee4e0c30
- Merge remote-tracking branch 'gitup/development_master' into development_master · ad2b54d3
  Julian Dehne authored 5 years ago
  
  ad2b54d3
- fixed problems with rocketchat mapping · 8da3a5e3
  Julian Dehne authored 5 years ago
  
  8da3a5e3
- Merge remote-tracking branch 'gitup/development_master' into development_master · a0995b9b
  wiepke authored 5 years ago
  
  a0995b9b
- working on issue #125 · d45892e2
  wiepke authored 5 years ago
  
  Umlaute are possible in projectName now
  d45892e2
- fixed problems with rocketchat mapping · f594cc6c
  Julian Dehne authored 5 years ago
  
  f594cc6c
- Merge remote-tracking branch 'gitup/development_master' into development_master · 734c4403
  Julian Dehne authored 5 years ago
  
  734c4403
- Merge branch 'development_master' of... · 167d1b19
  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/process/tasks/TaskOrder.java
  167d1b19
Jun 21, 2019
- fixing issue #60 · 8956063c
  wiepke authored 5 years ago
  
  8956063c
- Merge remote-tracking branch 'gitup/development_master' into development_master · d5756a24
  wiepke authored 5 years ago
  
  d5756a24
- fixing issue #132 · 8381ca26
  wiepke authored 5 years ago
  
  8381ca26
- Merge branch 'development_master' of... · 768a6d31
  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/process/tasks/TaskOrder.java
  768a6d31
- stash · 2b623a5f
  Julian Dehne authored 5 years ago
  
  2b623a5f
- Merge branch 'development_master' of... · bdb3ad37
  Julian Dehne authored 5 years ago
  
  Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master
  bdb3ad37
- Merge branch 'development_master' of... · 8aba78a1
  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/process/tasks/TaskOrder.java
  8aba78a1
- Merge remote-tracking branch 'gitup/development_master' into development_master · e733a9e4
  wiepke authored 5 years ago
  
  e733a9e4
- fixing minor UI-Issues · 8a9b8613
  wiepke authored 5 years ago
  
  8a9b8613
- add backlinks to portfolio pages · 7f66cca1
  Martin Staehr authored 5 years ago
  
  7f66cca1
- adds module availability configuration class and deactivates portfolio · c7b911e9
  Martin Staehr authored 5 years ago
  
  c7b911e9
- #97 adds edit function for portfolio entries · 34bdbbf5
  Martin Staehr authored 5 years ago
  
  34bdbbf5
- Merge branch 'development_master' of... · a2c983b5
  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/process/tasks/TaskOrder.java
  a2c983b5
- implemented project ending · c943ab60
  Julian Dehne authored 5 years ago
  
  c943ab60
- final-grades.jsp cool stuff · e1184f58
  wiepke authored 5 years ago
  
  e1184f58
Jun 20, 2019
- final-grades.jsp cool stuff · 4da897c7
  wiepke authored 5 years ago
  
  4da897c7
- Merge remote-tracking branch 'gitup/development_master' into development_master · 4d152242
  wiepke authored 5 years ago
  
  4d152242
- final-grades.jsp cool stuff · c6127e9d
  wiepke authored 5 years ago
  
  c6127e9d
- implemented project ending · dbcd5779
  Julian Dehne authored 5 years ago
  
  dbcd5779
- Merge remote-tracking branch 'gitup/development_master' into development_master · 872d4530
  wiepke authored 5 years ago
  
  872d4530