Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk (7828f136) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

7828f136

Commit 7828f136 authored 4 years ago by User expired

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk

parents 0d8320a4 b435e37e

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java 4 additions, 3 deletions

...ible/impl/elements/richText/RichTextElementComponent.java
src/main/java/org/olat/course/nodes/pf/manager/FileSystemExport.java 25 additions, 5 deletions

...va/org/olat/course/nodes/pf/manager/FileSystemExport.java
src/main/java/org/olat/ims/qti21/resultexport/QTI21ResultsExportMediaResource.java 18 additions, 8 deletions

...s/qti21/resultexport/QTI21ResultsExportMediaResource.java
src/main/java/org/olat/ims/qti21/resultexport/_content/qtiListing.html 17 additions, 17 deletions

.../org/olat/ims/qti21/resultexport/_content/qtiListing.html
src/main/java/org/olat/ims/qti21/resultexport/_content/qtiUserlisting.html 6 additions, 6 deletions

.../olat/ims/qti21/resultexport/_content/qtiUserlisting.html
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

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

...modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties

with 78 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment