Commit 3217e251 authored 6 years ago by Julian Dehne

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

parents 88991d7f fd7727fb

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp 3 additions, 3 deletions

...rschen/src/main/webapp/annotation/annotation-document.jsp
gemeinsamforschen/src/main/webapp/annotation/unstructured-annotation.jsp 3 additions, 3 deletions

...en/src/main/webapp/annotation/unstructured-annotation.jsp
gemeinsamforschen/src/main/webapp/annotation/unstructured-upload.jsp 5 additions, 4 deletions

...rschen/src/main/webapp/annotation/unstructured-upload.jsp
gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp 4 additions, 4 deletions

gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp 4 additions, 4 deletions

gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
gemeinsamforschen/src/main/webapp/assessment/assessmentCalculator.jsp 3 additions, 3 deletions

...schen/src/main/webapp/assessment/assessmentCalculator.jsp
gemeinsamforschen/src/main/webapp/assessment/createQuiz.jsp 4 additions, 4 deletions

gemeinsamforschen/src/main/webapp/assessment/createQuiz.jsp
gemeinsamforschen/src/main/webapp/assessment/finalAssessments.jsp 4 additions, 4 deletions

...mforschen/src/main/webapp/assessment/finalAssessments.jsp
gemeinsamforschen/src/main/webapp/assessment/rateContribution.jsp 4 additions, 4 deletions

...mforschen/src/main/webapp/assessment/rateContribution.jsp
gemeinsamforschen/src/main/webapp/assessment/takeQuiz.jsp 4 additions, 4 deletions

gemeinsamforschen/src/main/webapp/assessment/takeQuiz.jsp
gemeinsamforschen/src/main/webapp/assessment/viewQuiz.jsp 4 additions, 4 deletions

gemeinsamforschen/src/main/webapp/assessment/viewQuiz.jsp
gemeinsamforschen/src/main/webapp/core/session/session_example_1.jsp 1 addition, 1 deletion

...rschen/src/main/webapp/core/session/session_example_1.jsp
gemeinsamforschen/src/main/webapp/core/session/session_example_2.jsp 1 addition, 1 deletion

...rschen/src/main/webapp/core/session/session_example_2.jsp
gemeinsamforschen/src/main/webapp/course/createProject.jsp 4 additions, 4 deletions

gemeinsamforschen/src/main/webapp/course/createProject.jsp
gemeinsamforschen/src/main/webapp/course/editDescription.jsp 2 additions, 2 deletions

gemeinsamforschen/src/main/webapp/course/editDescription.jsp
gemeinsamforschen/src/main/webapp/course/enrollProject.jsp 1 addition, 1 deletion

gemeinsamforschen/src/main/webapp/course/enrollProject.jsp
gemeinsamforschen/src/main/webapp/course/specificRequirement.jsp 3 additions, 3 deletions

...amforschen/src/main/webapp/course/specificRequirement.jsp
gemeinsamforschen/src/main/webapp/course/specificSkills.jsp 1 addition, 1 deletion

gemeinsamforschen/src/main/webapp/course/specificSkills.jsp
gemeinsamforschen/src/main/webapp/docent/changePhase.jsp 4 additions, 4 deletions

gemeinsamforschen/src/main/webapp/docent/changePhase.jsp
gemeinsamforschen/src/main/webapp/docent/overview-docent.jsp 3 additions, 3 deletions

gemeinsamforschen/src/main/webapp/docent/overview-docent.jsp

with 62 additions and 61 deletions

Please register or to comment