Merge remote-tracking branch 'origin/OpenOLAT_14.2' (a0e878c1) · 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

a0e878c1

Commit a0e878c1 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 85499782 b27da2e0

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/group/ui/main/_i18n/LocalStrings_ru.properties 1 addition, 1 deletion

...a/org/olat/group/ui/main/_i18n/LocalStrings_ru.properties
src/main/java/org/olat/gui/control/_i18n/LocalStrings_ru.properties 2 additions, 1 deletion

...ava/org/olat/gui/control/_i18n/LocalStrings_ru.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_ru.properties 101 additions, 1 deletion

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_ru.properties
src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonManager.java 2 additions, 1 deletion

.../org/olat/modules/bigbluebutton/BigBlueButtonManager.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 8 additions, 10 deletions

...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonUtils.java 1 addition, 1 deletion

...lat/modules/bigbluebutton/manager/BigBlueButtonUtils.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java 6 additions, 3 deletions

...ules/bigbluebutton/ui/BigBlueButtonMeetingController.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonTemplateController.java 0 additions, 19 deletions

...bigbluebutton/ui/EditBigBlueButtonTemplateController.java

with 121 additions and 37 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