Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk (8b3afc49) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 8b3afc49 authored 5 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

parents 172f4c63 30d6292c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/org/olat/commons/calendar/ui/CalendarDetailsController.java 30 additions, 21 deletions

...g/olat/commons/calendar/ui/CalendarDetailsController.java
src/main/java/org/olat/commons/calendar/ui/_content/event_details.html 6 additions, 0 deletions

.../org/olat/commons/calendar/ui/_content/event_details.html
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../doceditor/onlyoffice/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java 6 additions, 2 deletions

...ents/form/flexible/impl/elements/FileElementRenderer.java
src/main/java/org/olat/course/CoursefolderWebDAVMergeSource.java 6 additions, 1 deletion

...n/java/org/olat/course/CoursefolderWebDAVMergeSource.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamMetadataController.java 28 additions, 20 deletions

...rse/nodes/livestream/ui/LiveStreamMetadataController.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamPeekviewController.java 28 additions, 17 deletions

...rse/nodes/livestream/ui/LiveStreamPeekviewController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java 2 additions, 0 deletions

...ims/qti21/ui/editor/interactions/FIBEditorController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBTextEntrySettingsController.java 6 additions, 5 deletions

...i/editor/interactions/FIBTextEntrySettingsController.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonEditMeetingsController.java 10 additions, 1 deletion

...bigbluebutton/ui/BigBlueButtonEditMeetingsController.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingTableModel.java 3 additions, 1 deletion

...ules/bigbluebutton/ui/BigBlueButtonMeetingTableModel.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java 22 additions, 3 deletions

.../bigbluebutton/ui/EditBigBlueButtonMeetingController.java
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

.../olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/qpool/ui/metadata/MetadataBulkChangeController.java 9 additions, 4 deletions

...dules/qpool/ui/metadata/MetadataBulkChangeController.java
src/main/java/org/olat/modules/taxonomy/ui/DeleteTaxonomyLevelController.java 21 additions, 5 deletions

...at/modules/taxonomy/ui/DeleteTaxonomyLevelController.java
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties 5 additions, 2 deletions

...olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties 4 additions, 1 deletion

...olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties

with 193 additions and 88 deletions

Please register or to comment