Commit ebc72112 authored 6 years ago by Julian Dehne

Merge branch 'development_master' of...

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

parents 609b0162 504f8cbc

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/Group.java 9 additions, 2 deletions

...chen/src/main/java/unipotsdam/gf/modules/group/Group.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java 11 additions, 2 deletions

...n/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupData.java 23 additions, 0 deletions

.../src/main/java/unipotsdam/gf/modules/group/GroupData.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupView.java 47 additions, 5 deletions

.../src/main/java/unipotsdam/gf/modules/group/GroupView.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupfindingImpl.java 89 additions, 0 deletions

...in/java/unipotsdam/gf/modules/group/GroupfindingImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/ProfileDAO.java 146 additions, 0 deletions

...src/main/java/unipotsdam/gf/modules/group/ProfileDAO.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/ProfileQuestion.java 46 additions, 0 deletions

...ain/java/unipotsdam/gf/modules/group/ProfileQuestion.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/ProfileQuestionAnswer.java 54 additions, 0 deletions

...va/unipotsdam/gf/modules/group/ProfileQuestionAnswer.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/ProfileQuestionRelation.java 43 additions, 0 deletions

.../unipotsdam/gf/modules/group/ProfileQuestionRelation.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/ProfileQuestionRelationType.java 17 additions, 0 deletions

...potsdam/gf/modules/group/ProfileQuestionRelationType.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/ScaledProfileQuestion.java 4 additions, 0 deletions

...va/unipotsdam/gf/modules/group/ScaledProfileQuestion.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/service/GroupDAO.java 0 additions, 150 deletions

.../unipotsdam/gf/modules/groupfinding/service/GroupDAO.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java 9 additions, 9 deletions

...ain/java/unipotsdam/gf/modules/journal/model/Journal.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java 4 additions, 4 deletions

...ipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/util/JournalUtils.java 1 addition, 1 deletion

...java/unipotsdam/gf/modules/journal/util/JournalUtils.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java 8 additions, 1 deletion

.../java/unipotsdam/gf/modules/journal/view/JournalView.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/Management.java 3 additions, 1 deletion

...c/main/java/unipotsdam/gf/modules/project/Management.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ManagementImpl.java 21 additions, 8 deletions

...in/java/unipotsdam/gf/modules/project/ManagementImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/Project.java 23 additions, 15 deletions

.../src/main/java/unipotsdam/gf/modules/project/Project.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectConfiguration.java 5 additions, 5 deletions

...a/unipotsdam/gf/modules/project/ProjectConfiguration.java

with 563 additions and 203 deletions

Please register or to comment