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

46a95ac8

Commit 46a95ac8 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 10a65a58 656519da

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/collaboration/CollaborationToolsFactory.java 14 additions, 1 deletion

...ava/org/olat/collaboration/CollaborationToolsFactory.java
src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonManager.java 11 additions, 2 deletions

.../org/olat/modules/bigbluebutton/BigBlueButtonManager.java
src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonMeetingTemplate.java 6 additions, 6 deletions

...t/modules/bigbluebutton/BigBlueButtonMeetingTemplate.java
src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonTemplatePermissions.java 12 additions, 12 deletions

...dules/bigbluebutton/BigBlueButtonTemplatePermissions.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 13 additions, 13 deletions

...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
src/main/java/org/olat/modules/bigbluebutton/model/BigBlueButtonMeetingTemplateImpl.java 7 additions, 5 deletions

...bigbluebutton/model/BigBlueButtonMeetingTemplateImpl.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonEditMeetingsController.java 7 additions, 7 deletions

...bigbluebutton/ui/BigBlueButtonEditMeetingsController.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonRunController.java 5 additions, 5 deletions

.../modules/bigbluebutton/ui/BigBlueButtonRunController.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java 7 additions, 7 deletions

.../bigbluebutton/ui/EditBigBlueButtonMeetingController.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonTemplateController.java 9 additions, 9 deletions

...bigbluebutton/ui/EditBigBlueButtonTemplateController.java

with 91 additions and 67 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