gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java · e3fae2016779733cba3d1d6e6b12b07cf2cc291d · fides / fltrail

6 years ago

Merge remote-tracking branch 'origin/rocketChatApiImpl_#63' into development_master · e3fae201

Julian Dehne authored 6 years ago

# Conflicts:
#	gemeinsamforschen/pom.xml
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/ChatWindow.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/Messages.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/DummyProjectCreationService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/service/GroupDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/User.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/UserDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/UserView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/phases/PhasesImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/util/ResultSetUtil.java
#	gemeinsamforschen/src/main/webapp/profile/profile.jsp
#	gemeinsamforschen/src/main/webapp/project-docent.jsp
#	gemeinsamforschen/src/main/webapp/project-student.jsp
#	gemeinsamforschen/src/main/webapp/taglibs/gemeinsamForschen.tld
#	gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql
#	gemeinsamforschen/src/test/java/unipotsdam/gf/core/management/group/GroupDAOTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/CommunicationDummyServiceTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/groupfinding/dummy/service/DummyProjectCreationServiceTest.java
#	gemeinsamforschen/src/test/resources/database/fltrail.sql

e3fae201

History

Merge remote-tracking branch 'origin/rocketChatApiImpl_#63' into development_master

Julian Dehne authored 6 years ago

# Conflicts:
#	gemeinsamforschen/pom.xml
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/ChatWindow.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/Messages.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/DummyProjectCreationService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/service/GroupDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/User.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/UserDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/UserView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/phases/PhasesImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/util/ResultSetUtil.java
#	gemeinsamforschen/src/main/webapp/profile/profile.jsp
#	gemeinsamforschen/src/main/webapp/project-docent.jsp
#	gemeinsamforschen/src/main/webapp/project-student.jsp
#	gemeinsamforschen/src/main/webapp/taglibs/gemeinsamForschen.tld
#	gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql
#	gemeinsamforschen/src/test/java/unipotsdam/gf/core/management/group/GroupDAOTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/CommunicationDummyServiceTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/groupfinding/dummy/service/DummyProjectCreationServiceTest.java
#	gemeinsamforschen/src/test/resources/database/fltrail.sql