Commits · 379a7ba9773decb66268b736e945f3244046dd0f · fides / fltrail

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 · 3fefc72b

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

3fefc72b

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
Merge remote-tracking branch 'gitup/development_master' into development_master · 504f8cbc
wiepke authored 6 years ago

504f8cbc

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

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

c7c7acbd

Merge remote-tracking branch 'gitup/groupfinding_module' into development_master · 71baf563

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

71baf563

Merge branch 'development_master' of... · eb211308

wiepke authored 6 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/TaskDAO.java

eb211308

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

Merge branch 'development_master' of... · f44062da

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

f44062da

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
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · 588c746d
  Julian Dehne authored 6 years ago
  
  588c746d
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · f45a7a69
  Julian Dehne authored 6 years ago
  
  f45a7a69
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · b1449575
  Julian Dehne authored 6 years ago
  
  b1449575
- 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
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · 856e90d4
  wiepke authored 6 years ago
  
  856e90d4
- 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 merged into groupfinding · 11cfde66
  wiepke authored 6 years ago
  
  11cfde66
- group-creation-manual · e150c5df
  wiepke authored 6 years ago
  
  e150c5df
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · 4c8033c8
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/test/java/unipotsdam/gf/process/tasks/GroupPhaseTaskTest.java
  4c8033c8
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · 004570ec
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupfindingImpl.java # gemeinsamforschen/src/test/java/unipotsdam/gf/process/tasks/GroupPhaseTaskTest.java # gemeinsamforschen/src/test/resources/database/fltrail.sql
  004570ec
Nov 07, 2018

Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · da0eac14

Julian Dehne authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupfindingImpl.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/process/tasks/GroupPhaseTaskTest.java
#	gemeinsamforschen/src/test/resources/database/fltrail.sql

da0eac14

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
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · 9e29bb1c
  Julian Dehne authored 6 years ago
  
  9e29bb1c
- 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
- Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module · 46a303c7
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java # gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/ChatWindow.java
  46a303c7
- Implemented ChatWindow for Project Scope · 81c7a59a
  Julian Dehne authored 6 years ago
  
  references #8 Login is admin (needs fixing)
  81c7a59a