Merge branch 'development_master' into development_master_refactoring_1
# Conflicts: # gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld.orig
No related branches found
No related tags found
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java 20 additions, 2 deletions...in/java/unipotsdam/gf/core/management/ManagementImpl.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 4 additions, 12 deletions...m/gf/core/management/pageAppearance/omniDependencies.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java 3 additions, 3 deletions...n/java/unipotsdam/gf/core/management/project/Project.java
- 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/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 2 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
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Categories.java 1 addition, 2 deletions...am/gf/modules/assessment/controller/model/Categories.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java 0 additions, 1 deletion...m/gf/modules/assessment/controller/model/Performance.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java 83 additions, 12 deletions...essment/controller/service/AssessmentDBCommunication.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java 11 additions, 2 deletions.../modules/assessment/controller/service/FBAssessement.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java 34 additions, 5 deletions...modules/assessment/controller/service/PeerAssessment.java
Loading
Please register or sign in to comment