Merge OpenOLAT default branch to OpenOLAT qti with a123f50a275b4081bda1825b26dd4907620a1068 (32bca549) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 32bca549 authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with a123f50a275b4081bda1825b26dd4907620a1068

parents 3b5675b2 98512d5a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/components/htmlheader/jscss/CustomCSS.java 20 additions, 19 deletions

.../olat/core/gui/components/htmlheader/jscss/CustomCSS.java
src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java 4 additions, 4 deletions

...rg/olat/course/assessment/manager/BulkAssessmentTask.java
src/main/java/org/olat/course/editor/ChooseNodeController.java 4 additions, 0 deletions

...ain/java/org/olat/course/editor/ChooseNodeController.java
src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

...a/org/olat/course/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/GTACourseNode.java 1 addition, 0 deletions

src/main/java/org/olat/course/nodes/GTACourseNode.java
src/main/java/org/olat/course/nodes/_spring/buildingblockContext.xml 1 addition, 1 deletion

...va/org/olat/course/nodes/_spring/buildingblockContext.xml
src/main/java/org/olat/course/nodes/gta/ui/GTACoachController.java 24 additions, 8 deletions

...java/org/olat/course/nodes/gta/ui/GTACoachController.java
src/main/java/org/olat/course/nodes/gta/ui/GTACoachRevisionAndCorrectionsController.java 3 additions, 2 deletions

...odes/gta/ui/GTACoachRevisionAndCorrectionsController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java 7 additions, 3 deletions

...rg/olat/course/nodes/gta/ui/GTAParticipantController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java 1 addition, 1 deletion

...ta/ui/GTAParticipantRevisionAndCorrectionsController.java
src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java 17 additions, 5 deletions

...g/olat/course/nodes/gta/ui/GroupAssessmentController.java
src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java 11 additions, 2 deletions

...g/olat/course/nodes/gta/ui/SubmitDocumentsController.java
src/main/java/org/olat/course/nodes/gta/ui/_content/coach.html 3 additions, 3 deletions

...ain/java/org/olat/course/nodes/gta/ui/_content/coach.html
src/main/java/org/olat/course/nodes/gta/ui/_content/coach_group_grading.html 3 additions, 4 deletions

...lat/course/nodes/gta/ui/_content/coach_group_grading.html
src/main/java/org/olat/course/nodes/gta/ui/_content/run.html 0 additions, 23 deletions

src/main/java/org/olat/course/nodes/gta/ui/_content/run.html
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties 5 additions, 4 deletions

...olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/group/ui/main/MemberListTableSort.java 19 additions, 0 deletions

...main/java/org/olat/group/ui/main/MemberListTableSort.java
src/main/java/org/olat/portfolio/manager/EPPolicyManager.java 1 addition, 1 deletion

...main/java/org/olat/portfolio/manager/EPPolicyManager.java
src/main/java/org/olat/portfolio/manager/InvitationDAO.java 3 additions, 1 deletion

src/main/java/org/olat/portfolio/manager/InvitationDAO.java

with 132 additions and 85 deletions

Please register or to comment