Commit 88991d7f authored 6 years ago by Julian Dehne

Merge remote-tracking branch 'origin/development_master_refactoring_1' into groupfinding_prototyp

parents 6bd453b9 0f4edc6c

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/core/management/Management.java 7 additions, 2 deletions

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

...in/java/unipotsdam/gf/core/management/ManagementImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java.orig 389 additions, 0 deletions

...va/unipotsdam/gf/core/management/ManagementImpl.java.orig
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java 6 additions, 3 deletions

.../main/java/unipotsdam/gf/core/management/group/Group.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java 112 additions, 0 deletions

...va/unipotsdam/gf/core/management/pageAppearance/Menu.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/footer.java 54 additions, 0 deletions

.../unipotsdam/gf/core/management/pageAppearance/footer.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/headLine.java 4 additions, 6 deletions

...nipotsdam/gf/core/management/pageAppearance/headLine.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java 27 additions, 0 deletions

...m/gf/core/management/pageAppearance/omniDependencies.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java 18 additions, 28 deletions

...n/java/unipotsdam/gf/core/management/project/Project.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java.orig 165 additions, 0 deletions

...a/unipotsdam/gf/core/management/project/Project.java.orig
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java 1 addition, 1 deletion

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

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

.../java/unipotsdam/gf/core/management/user/UserService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java 6 additions, 6 deletions

...n/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java 6 additions, 7 deletions

...rc/main/java/unipotsdam/gf/core/states/PhasesService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/ProjectPhase.java 1 addition, 1 deletion

...src/main/java/unipotsdam/gf/core/states/ProjectPhase.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/configPhaseShift.java 11 additions, 0 deletions

...main/java/unipotsdam/gf/core/states/configPhaseShift.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/Feedback.java 12 additions, 4 deletions

...chen/src/main/java/unipotsdam/gf/interfaces/Feedback.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java 4 additions, 12 deletions

...chen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java 10 additions, 3 deletions

...c/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java

with 917 additions and 108 deletions

Please register or to comment