# 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

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

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

feat: commented the sql tables for Martins MA

# Conflicts:
#	gemeinsamforschen/src/test/java/unipotsdam/gf/process/tasks/GroupPhaseTaskTest.java

# 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

# 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

implemented sso

implemented sso

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/ChatWindow.java

references #8
Login is admin (needs fixing)

references #8
Login is admin (needs fixing)

Merge remote-tracking branch 'origin/integrating_martins_module_#8' into integrating_martins_module_#8

Martin Staehr authored 6 years ago and Julian Dehne committed 6 years ago

Merge remote-tracking branch 'origin/integrating_martins_module_#8' into integrating_martins_module_#8

Merge remote-tracking branch 'origin/integrating_martins_module_#8' into integrating_martins_module_#8