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

e00d067f

Commit e00d067f authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents 8b9f2641 bab92b56

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/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 2 additions, 4 deletions

...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
src/main/java/org/olat/modules/bigbluebutton/model/BigBlueButtonServerInfos.java 12 additions, 1 deletion

...modules/bigbluebutton/model/BigBlueButtonServerInfos.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonAdminServersController.java 1 addition, 1 deletion

...bigbluebutton/ui/BigBlueButtonAdminServersController.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonAdminServersTableModel.java 2 additions, 2 deletions

...bigbluebutton/ui/BigBlueButtonAdminServersTableModel.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonServerRow.java 6 additions, 6 deletions

...olat/modules/bigbluebutton/ui/BigBlueButtonServerRow.java
src/main/java/org/olat/modules/bigbluebutton/ui/StatusCellRenderer.java 66 additions, 0 deletions

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

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

...modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties

with 97 additions and 14 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