Commit 9bbae0ff authored 6 years ago by Martin Stähr

Merge branch 'communication' into development_master

# Conflicts:
#	.gitignore
#	gemeinsamforschen/src/scripts/dbschema/fltrail.sql

parents 8e958114 f76f847d

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 2 deletions

.gitignore
gemeinsamforschen/pom.xml 11 additions, 0 deletions

gemeinsamforschen/pom.xml
gemeinsamforschen/src/main/java/unipotsdam/gf/config/Constants.java 6 additions, 0 deletions

...orschen/src/main/java/unipotsdam/gf/config/Constants.java
gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 15 additions, 0 deletions

...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java 1 addition, 1 deletion

.../src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java
gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFResourceConfig.java 11 additions, 0 deletions

.../src/main/java/unipotsdam/gf/config/GFResourceConfig.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java 1 addition, 1 deletion

.../java/unipotsdam/gf/core/database/mysql/MysqlConnect.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/VereinfachtesResultSet.java 14 additions, 1 deletion

...otsdam/gf/core/database/mysql/VereinfachtesResultSet.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java 51 additions, 2 deletions

...c/main/java/unipotsdam/gf/core/management/Management.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java 143 additions, 16 deletions

...in/java/unipotsdam/gf/core/management/ManagementImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java 67 additions, 0 deletions

.../main/java/unipotsdam/gf/core/management/group/Group.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java 36 additions, 18 deletions

...n/java/unipotsdam/gf/core/management/project/Project.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java 6 additions, 6 deletions

...ava/unipotsdam/gf/core/management/user/HiddenUserTag.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/SessionValidator.java 10 additions, 5 deletions

.../unipotsdam/gf/core/management/user/SessionValidator.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/User.java 25 additions, 6 deletions

...rc/main/java/unipotsdam/gf/core/management/user/User.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java 17 additions, 7 deletions

.../java/unipotsdam/gf/core/management/user/UserService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java 7 additions, 1 deletion

...rc/main/java/unipotsdam/gf/interfaces/ICommunication.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/ChatWindow.java 40 additions, 0 deletions

.../java/unipotsdam/gf/modules/communication/ChatWindow.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java 53 additions, 8 deletions

...ules/communication/service/CommunicationDummyService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/view/CommunicationView.java 186 additions, 0 deletions

...sdam/gf/modules/communication/view/CommunicationView.java

with 702 additions and 74 deletions

Please register or to comment