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

cf0f9d00

"README.md" did not exist on "1b728cb6bda5a4120526868b90b6145298ada667"

Commit cf0f9d00 authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents 9fcf5a33 9fdc257b

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/NewControllerFactory.java 75 additions, 71 deletions

src/main/java/org/olat/NewControllerFactory.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 1 addition, 0 deletions

...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java 7 additions, 2 deletions

...ules/bigbluebutton/ui/BigBlueButtonMeetingController.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/webapp/static/js/jquery/openolat/jquery.paint.js 42 additions, 12 deletions

src/main/webapp/static/js/jquery/openolat/jquery.paint.js

with 128 additions and 85 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