Merge remote-tracking branch 'origin/OpenOLAT_14.2' (969f602b) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 969f602b authored 5 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_14.2'

parents 4d358cfe 4fd40a92

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/admin/restapi/_i18n/LocalStrings_de.properties 40 additions, 39 deletions

...a/org/olat/admin/restapi/_i18n/LocalStrings_de.properties
src/main/java/org/olat/collaboration/CollaborationTools.java 13 additions, 1 deletion

src/main/java/org/olat/collaboration/CollaborationTools.java
src/main/java/org/olat/collaboration/CollaborationToolsFactory.java 9 additions, 4 deletions

...ava/org/olat/collaboration/CollaborationToolsFactory.java
src/main/java/org/olat/collaboration/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...a/org/olat/collaboration/_i18n/LocalStrings_de.properties
src/main/java/org/olat/collaboration/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...a/org/olat/collaboration/_i18n/LocalStrings_en.properties
src/main/java/org/olat/collaboration/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...a/org/olat/collaboration/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/logging/activity/OlatResourceableType.java 1 addition, 0 deletions

.../org/olat/core/logging/activity/OlatResourceableType.java
src/main/java/org/olat/course/_spring/courseContext.xml 1 addition, 0 deletions

src/main/java/org/olat/course/_spring/courseContext.xml
src/main/java/org/olat/course/nodes/BigBlueButtonCourseNode.java 153 additions, 0 deletions

...n/java/org/olat/course/nodes/BigBlueButtonCourseNode.java
src/main/java/org/olat/course/nodes/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...va/org/olat/course/nodes/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/_i18n/LocalStrings_en.properties 4 additions, 3 deletions

...va/org/olat/course/nodes/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonAssessmentHandler.java 40 additions, 0 deletions

...e/nodes/bigbluebutton/BigBlueButtonAssessmentHandler.java
src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonConfigForm.java 82 additions, 0 deletions

...t/course/nodes/bigbluebutton/BigBlueButtonConfigForm.java
src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonCourseNodeConfiguration.java 87 additions, 0 deletions

...s/bigbluebutton/BigBlueButtonCourseNodeConfiguration.java
src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonEditController.java 129 additions, 0 deletions

...urse/nodes/bigbluebutton/BigBlueButtonEditController.java
src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonLearningPathNodeHandler.java 80 additions, 0 deletions

...s/bigbluebutton/BigBlueButtonLearningPathNodeHandler.java
src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonPeekViewController.java 59 additions, 0 deletions

.../nodes/bigbluebutton/BigBlueButtonPeekViewController.java
src/main/java/org/olat/course/nodes/bigbluebutton/_content/edit.html 1 addition, 0 deletions

...va/org/olat/course/nodes/bigbluebutton/_content/edit.html
src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_de.properties 11 additions, 0 deletions

...urse/nodes/bigbluebutton/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_en.properties 11 additions, 0 deletions

...urse/nodes/bigbluebutton/_i18n/LocalStrings_en.properties

with 725 additions and 47 deletions

Please register or to comment