Commit 240d8b77 authored 6 years ago by Julian Dehne

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

parents 8d830f7e 76d97422

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/ManagementImpl.java 1 addition, 3 deletions

...in/java/unipotsdam/gf/core/management/ManagementImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java.orig 1 addition, 1 deletion

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

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

...va/unipotsdam/gf/core/management/pageAppearance/Menu.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java 1 addition, 1 deletion

...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/UserService.java 0 additions, 4 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
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java 6 additions, 1 deletion

...c/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPhases.java 1 addition, 1 deletion

...schen/src/main/java/unipotsdam/gf/interfaces/IPhases.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java 11 additions, 0 deletions

.../modules/assessment/controller/service/FBAssessement.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java 11 additions, 0 deletions

...modules/assessment/controller/service/PeerAssessment.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java 11 additions, 0 deletions

...es/assessment/controller/service/PeerAssessmentDummy.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java 6 additions, 6 deletions

...ipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java

with 138 additions and 46 deletions

Please register or to comment