Commit 76d97422 authored 6 years ago by Thomas Schnaak

Merge remote-tracking branch 'origin/development_master' into 83_unifyCollumNames

parents f8033f98 004425d5

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 39 additions, 26 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/Footer.java 4 additions, 4 deletions

.../unipotsdam/gf/core/management/pageAppearance/Footer.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java 1 addition, 1 deletion

...nipotsdam/gf/core/management/pageAppearance/HeadLine.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java 26 additions, 16 deletions

...va/unipotsdam/gf/core/management/pageAppearance/Menu.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java 47 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/ProjectConfiguration.java 1 addition, 1 deletion

...sdam/gf/core/management/project/ProjectConfiguration.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectConfigurationDAO.java 1 addition, 3 deletions

...m/gf/core/management/project/ProjectConfigurationDAO.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java 0 additions, 67 deletions

...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 2 additions, 6 deletions

.../java/unipotsdam/gf/core/management/user/UserService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/session/GFContext.java 1 addition, 1 deletion

...n/src/main/java/unipotsdam/gf/core/session/GFContext.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java 47 additions, 7 deletions

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

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

...main/java/unipotsdam/gf/core/states/configPhaseShift.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/model/Constraints.java 34 additions, 0 deletions

...ain/java/unipotsdam/gf/core/states/model/Constraints.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/model/ProjectPhase.java 1 addition, 1 deletion

...in/java/unipotsdam/gf/core/states/model/ProjectPhase.java

with 633 additions and 187 deletions

Please register or to comment