Commit ba23e070 authored 6 years ago by tudtianus

Merge remote-tracking branch 'remotes/origin/pages_overview' into Journal

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java

parents b78d2195 0e6a32a0

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/database/mysql/VereinfachtesResultSet.java 39 additions, 15 deletions

...otsdam/gf/core/database/mysql/VereinfachtesResultSet.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java 31 additions, 0 deletions

...in/java/unipotsdam/gf/core/management/ManagementImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java 1 addition, 0 deletions

...ava/unipotsdam/gf/core/management/user/HiddenUserTag.java
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java 38 additions, 28 deletions

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

.../java/unipotsdam/gf/core/management/user/UserService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java 2 additions, 2 deletions

...c/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReports.java 8 additions, 0 deletions

...c/main/java/unipotsdam/gf/interfaces/ResearchReports.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Quiz.java 8 additions, 7 deletions

...ipotsdam/gf/modules/assessment/controller/model/Quiz.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java 1 addition, 1 deletion

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

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

...es/assessment/controller/service/PeerAssessmentDummy.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java 6 additions, 3 deletions

...tsdam/gf/modules/assessment/controller/view/QuizView.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java 1 addition, 1 deletion

...tsdam/gf/modules/journal/view/ProjectDescriptionView.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Bibliography.java 4 additions, 0 deletions

...va/unipotsdam/gf/modules/researchreport/Bibliography.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchQuestion.java 4 additions, 0 deletions

...nipotsdam/gf/modules/researchreport/ResearchQuestion.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java 110 additions, 0 deletions

.../unipotsdam/gf/modules/researchreport/ResearchReport.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReportManagement.java 4 additions, 4 deletions

...m/gf/modules/researchreport/ResearchReportManagement.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Timeplanning.java 4 additions, 0 deletions

...va/unipotsdam/gf/modules/researchreport/Timeplanning.java
gemeinsamforschen/src/main/webapp/assets/css/footer.css 43 additions, 0 deletions

gemeinsamforschen/src/main/webapp/assets/css/footer.css
gemeinsamforschen/src/main/webapp/assets/css/researchReport.css 182 additions, 0 deletions

...samforschen/src/main/webapp/assets/css/researchReport.css

with 537 additions and 96 deletions

Please register or to comment