Commits · dbfb03bf2233f0dd4682817ca8b8aab9aaba2ccb · fides / fltrail

Nov 29, 2018
- - added hotfix damit Maren sich einloggen kann · dbfb03bf
  Maren Schulze authored 6 years ago
  
  dbfb03bf
Nov 26, 2018

Merge branch 'development_master' of... · 0f4371b3

Julian Dehne authored 6 years ago

Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into groupfinding_module

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/Project.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/ProjectCreationProcess.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/session/SessionExistsFilter.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/util/ResultSetUtil.java
#	gemeinsamforschen/src/main/webapp/profile/profile.jsp
#	gemeinsamforschen/src/main/webapp/project/js/create-project.js
#	gemeinsamforschen/src/main/webapp/project/overview-student.jsp
#	gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp
#	gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
#	gemeinsamforschen/src/scripts/dbschema/createDummyUsersGroupsProject.sql
#	gemeinsamforschen/src/test/resources/database/fltrail.sql

0f4371b3

Nov 23, 2018
- styling and makeup for tasks, menu, chat, ... · 379a7ba9
  wiepke authored 6 years ago
  
  379a7ba9
Nov 20, 2018

Merge remote-tracking branch 'gitup/groupfinding_module' into development_master · 9c1aabc3

wiepke authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java
#	gemeinsamforschen/src/main/webapp/groupfinding/create-groups-manual.jsp
#	gemeinsamforschen/src/main/webapp/groupfinding/css/edit-groups.css
#	gemeinsamforschen/src/main/webapp/groupfinding/edit-groups.jsp
#	gemeinsamforschen/src/main/webapp/groupfinding/js/create-groups-manual.js
#	gemeinsamforschen/src/main/webapp/groupfinding/js/edit-groups.js

9c1aabc3

Merge remote-tracking branch 'gitup/groupfinding_module' into development_master · 6d5f4646

wiepke authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java
#	gemeinsamforschen/src/main/webapp/groupfinding/create-groups-manual.jsp
#	gemeinsamforschen/src/main/webapp/groupfinding/css/edit-groups.css
#	gemeinsamforschen/src/main/webapp/groupfinding/edit-groups.jsp
#	gemeinsamforschen/src/main/webapp/groupfinding/js/create-groups-manual.js
#	gemeinsamforschen/src/main/webapp/groupfinding/js/edit-groups.js

6d5f4646

Nov 19, 2018
- fix the merge · 30c6f134
  wiepke authored 6 years ago
  
  30c6f134
- Task are sorted by creation Date in tasks.jsp. Project description was added · e8b3f3a7
  wiepke authored 6 years ago
  
  e8b3f3a7
- Task are sorted by creation Date in tasks.jsp. Project description was added · 965f012f
  wiepke authored 6 years ago
  
  965f012f
- feat: implemented group chat · 21d4787c
  Julian Dehne authored 6 years ago
  
  21d4787c
Nov 16, 2018
- Task are sorted by creation Date in tasks.jsp. Project description was added · 812ff839
  wiepke authored 6 years ago
  
  812ff839
Nov 14, 2018
- feat: added ProfileQuestionDAO for the new groupfinding mechanism · c25819c7
  Julian Dehne authored 6 years ago
  
  feat: commented the sql tables for Martins MA
  c25819c7
Nov 13, 2018
- create-groups-manual prototype done · 8a82a77c
  wiepke authored 6 years ago
  
  8a82a77c
Nov 12, 2018
- create-groups-manual prototype done · 319c17d2
  wiepke authored 6 years ago
  
  319c17d2
- updated overview and divided into "myCourses" and "search courses" · d404a434
  wiepke authored 6 years ago
  
  d404a434
- group-creation-manual · e150c5df
  wiepke authored 6 years ago
  
  e150c5df
Nov 07, 2018
- implementiert Algorithmus für zufällige Gruppen · ede92756
  Julian Dehne authored 6 years ago
  
  ede92756
Nov 06, 2018
- implementiert Algorithmus für zufällige Gruppen · 43353b87
  Julian Dehne authored 6 years ago
  
  43353b87
- reconfigurate overview-student page. templating and search bar · f7170c04
  wiepke authored 6 years ago
  
  f7170c04
- whole category feedback · 81ca8d77
  wiepke authored 6 years ago
  
  81ca8d77
Nov 05, 2018
- UserView refaktorisiert · be3ac9a3
  Julian Dehne authored 6 years ago
  
  be3ac9a3
Nov 04, 2018
- references #8 · 73f4ca53
  Julian Dehne authored 6 years ago
  
  implemented sso
  73f4ca53
- references #8 · d52a5ebe
  Julian Dehne authored 6 years ago
  
  implemented sso
  d52a5ebe
Nov 02, 2018
- finalize your feedback on annotated unstructured dossier · 3dffcb32
  wiepke authored 6 years ago
  
  3dffcb32
Nov 01, 2018
- upload feedbackUser into fullsubmissions (untested) · 6ea0aa7a
  wiepke authored 6 years ago
  
  6ea0aa7a
- rocketChat cant connect to Websocket test · 2d7ddc16
  wiepke authored 6 years ago
  
  2d7ddc16
- Implemented ChatWindow for Project Scope · 81c7a59a
  Julian Dehne authored 6 years ago
  
  references #8 Login is admin (needs fixing)
  81c7a59a
Oct 30, 2018
- Implemented ChatWindow for Project Scope · 2b6c13a6
  Julian Dehne authored 6 years ago
  
  references #8 Login is admin (needs fixing)
  2b6c13a6
Oct 29, 2018
- svensModul · f1bd67f5
  wiepke authored 6 years ago
  
  f1bd67f5
- Deleting project · a492e6da
  wiepke authored 6 years ago
  
  a492e6da
Oct 25, 2018
- #5 integration of eJournal. Reworked DB-scheme · 4ae1842f
  Axel authored 6 years ago
  
  4ae1842f
- bugfixing Martins module · 06bbd12b
  Martin Staehr authored 6 years ago and Julian Dehne committed 6 years ago
  
  06bbd12b
- fix: use of false token · a9da046b
  Martin Staehr authored 6 years ago
  
  a9da046b
- fix: fix rocket.chat link and login test · 589b079b
  Martin Staehr authored 6 years ago
  
  589b079b
- references #8 · f63eda30
  Julian Dehne authored 6 years ago
  
  merged Martins Chat Module
  f63eda30
Oct 22, 2018
- feat: delete project started. menu and footer contain content wrapper · 4b2f00d0
  Axel authored 6 years ago
  
  4b2f00d0
- - implementing the annotation module · 0e21662c
  Julian Dehne authored 6 years ago
  
  - back and continue button
  0e21662c
Oct 18, 2018
- bugfixing: fixed feedbackassignment · d5056428
  Julian Dehne authored 6 years ago
  
  d5056428
- frontend annotation categories are checked before saved · a9549958
  Axel authored 6 years ago
  
  a9549958
- bugfixing: fixed small errors in annotation module · cbd47ea9
  Julian Dehne authored 6 years ago
  
  cbd47ea9
Oct 17, 2018
- bugfixing: fixed small errors in annotation module · 661d91b8
  Julian Dehne authored 6 years ago
  
  661d91b8