Merge branch 'course_tools' into learning_path (ec6bc747) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit ec6bc747 authored 5 years ago by uhensler

Browse files

Merge branch 'course_tools' into learning_path

parents 3c55a58b 26c13e3e

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/commons/info/ui/InfoDisplayController.java 4 additions, 19 deletions

.../java/org/olat/commons/info/ui/InfoDisplayController.java
src/main/java/org/olat/core/logging/activity/ActionObject.java 1 addition, 0 deletions

...ain/java/org/olat/core/logging/activity/ActionObject.java
src/main/java/org/olat/core/logging/activity/LearningResourceLoggingAction.java 13 additions, 0 deletions

.../core/logging/activity/LearningResourceLoggingAction.java
src/main/java/org/olat/course/config/CourseConfig.java 67 additions, 135 deletions

src/main/java/org/olat/course/config/CourseConfig.java
src/main/java/org/olat/course/config/CourseConfigEvent.java 4 additions, 1 deletion

src/main/java/org/olat/course/config/CourseConfigEvent.java
src/main/java/org/olat/course/config/ui/CourseToolbarController.java 131 additions, 41 deletions

...va/org/olat/course/config/ui/CourseToolbarController.java
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties 4 additions, 1 deletion

...rg/olat/course/config/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_en.properties 6 additions, 3 deletions

...rg/olat/course/config/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_fr.properties 1 addition, 2 deletions

...rg/olat/course/config/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_it.properties 1 addition, 2 deletions

...rg/olat/course/config/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 2 deletions

...olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/co/COEditController.java 6 additions, 15 deletions

src/main/java/org/olat/course/nodes/co/COEditController.java
src/main/java/org/olat/course/nodes/co/CORunController.java 3 additions, 8 deletions

src/main/java/org/olat/course/nodes/co/CORunController.java
src/main/java/org/olat/course/nodes/co/COToolController.java 147 additions, 0 deletions

src/main/java/org/olat/course/nodes/co/COToolController.java
src/main/java/org/olat/course/nodes/co/COToolRecipientsController.java 124 additions, 0 deletions

.../org/olat/course/nodes/co/COToolRecipientsController.java
src/main/java/org/olat/course/nodes/co/_content/tool.html 2 additions, 0 deletions

src/main/java/org/olat/course/nodes/co/_content/tool.html
src/main/java/org/olat/course/nodes/co/_i18n/LocalStrings_de.properties 7 additions, 12 deletions

...org/olat/course/nodes/co/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/co/_i18n/LocalStrings_en.properties 8 additions, 13 deletions

...org/olat/course/nodes/co/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/info/InfoRunController.java 56 additions, 23 deletions

...in/java/org/olat/course/nodes/info/InfoRunController.java
src/main/java/org/olat/course/nodes/members/MembersToolRunController.java 101 additions, 0 deletions

...g/olat/course/nodes/members/MembersToolRunController.java

with 687 additions and 277 deletions

Please register or to comment