Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 (1d6fe140) · 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

Admin message

Please note that we will be performing maintenance on our GitLab instance today, starting at 16:30h. Please plan your work accordingly. Thank you for understanding.

1d6fe140

Commit 1d6fe140 authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0

parents 2040b6a3 dfe2f6e1

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...ourse/assessment/ui/mode/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java 3 additions, 1 deletion

...ms/qti21/questionimport/CSVToAssessmentItemConverter.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java 1 addition, 1 deletion

...ules/bigbluebutton/ui/BigBlueButtonMeetingController.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java 1 addition, 0 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/bigbluebutton/ui/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...rg/olat/social/shareLink/_i18n/LocalStrings_de.properties
src/test/java/org/olat/selenium/page/qti/QTI21CSVImportWizard.java 2 additions, 1 deletion

...java/org/olat/selenium/page/qti/QTI21CSVImportWizard.java
src/test/java/org/olat/selenium/page/user/EfficiencyStatementPage.java 3 additions, 13 deletions

.../org/olat/selenium/page/user/EfficiencyStatementPage.java

with 16 additions and 19 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