Commits · f79807c2395dee3b7ad8f1e0c02c7e3e3dae3a33 · fides / fltrail

Jun 22, 2019
- restyled rate-contribution.jsp · f79807c2
  wiepke authored 5 years ago
  
  f79807c2
- 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
- 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
- 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
- UI fixing and start to implement "final-grades.jsp" · 228dddde
  wiepke authored 5 years ago
  
  228dddde
- Merge remote-tracking branch 'gitup/development_master' into development_master · 981fb6a9
  Julian Dehne authored 5 years ago
  
  981fb6a9
- implemented queries for assessment aggregation · c3b0de74
  Julian Dehne authored 5 years ago
  
  c3b0de74
- Merge remote-tracking branch 'gitup/development_master' into development_master · f8738923
  wiepke authored 5 years ago
  
  f8738923
- clickpath until "wait_for_grading" works · 508d96e6
  wiepke authored 5 years ago
  
  508d96e6
- Dummy Klasse für Grading Übersicht · 79648cc3
  Julian Dehne authored 5 years ago
  
  79648cc3
- merge fixes · f6558040
  wiepke authored 5 years ago
  
  f6558040
Jun 19, 2019
- #114 adjust code after pull · a3df847b
  Martin Staehr authored 5 years ago
  
  a3df847b
- Merge remote-tracking branch 'origin/development_master' into development_master · 71814b6a
  Martin Staehr authored 5 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/webapp/taglibs/js/unstructuredUpload.js
  71814b6a
- #114 add create button for Eportfolio entries to eportfolio page and · 07340781
  Martin Staehr authored 5 years ago
  
  change tasks
  07340781