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

2e2a85fe

Commit 2e2a85fe authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents a8fa919b f17431b6

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/BigBlueButtonCourseNode.java 0 additions, 3 deletions

...n/java/org/olat/course/nodes/BigBlueButtonCourseNode.java
src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonRoles.java 62 additions, 2 deletions

...va/org/olat/modules/bigbluebutton/BigBlueButtonRoles.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 2 additions, 0 deletions

...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonMeetingDAO.java 4 additions, 4 deletions

...odules/bigbluebutton/manager/BigBlueButtonMeetingDAO.java
src/main/java/org/olat/modules/bigbluebutton/model/BigBlueButtonMeetingTemplateImpl.java 2 additions, 2 deletions

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

...bigbluebutton/ui/BigBlueButtonEditMeetingsController.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java 34 additions, 10 deletions

.../bigbluebutton/ui/EditBigBlueButtonMeetingController.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonTemplateController.java 36 additions, 1 deletion

...bigbluebutton/ui/EditBigBlueButtonTemplateController.java
src/main/java/org/olat/modules/bigbluebutton/ui/TemplateMinuteCellRenderer.java 1 addition, 1 deletion

.../modules/bigbluebutton/ui/TemplateMinuteCellRenderer.java
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 6 additions, 0 deletions

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

...modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
src/test/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonMeetingDAOTest.java 10 additions, 4 deletions

...es/bigbluebutton/manager/BigBlueButtonMeetingDAOTest.java

with 209 additions and 30 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