Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (c5862a1b) · 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

c5862a1b

Commit c5862a1b authored 4 years ago by srosse

Downloads
- Plain Diff

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents c6e8e383 ac27031e

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/FormItemImpl.java 11 additions, 7 deletions

.../core/gui/components/form/flexible/impl/FormItemImpl.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonGuestJoinController.java 3 additions, 0 deletions

...es/bigbluebutton/ui/BigBlueButtonGuestJoinController.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java 8 additions, 0 deletions

...ules/bigbluebutton/ui/BigBlueButtonMeetingController.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java 28 additions, 14 deletions

.../bigbluebutton/ui/EditBigBlueButtonMeetingController.java
src/main/java/org/olat/modules/bigbluebutton/ui/_content/guest_join.html 1 addition, 1 deletion

...rg/olat/modules/bigbluebutton/ui/_content/guest_join.html
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 11 additions, 9 deletions

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

...modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
src/main/resources/database/mysql/alter_15_0_x_to_15_1_0.sql 1 addition, 1 deletion

src/main/resources/database/mysql/alter_15_0_x_to_15_1_0.sql
src/main/resources/database/oracle/alter_15_0_x_to_15_1_0.sql 1 addition, 1 deletion

...main/resources/database/oracle/alter_15_0_x_to_15_1_0.sql
src/main/resources/database/postgresql/alter_15_0_x_to_15_1_0.sql 1 addition, 1 deletion

.../resources/database/postgresql/alter_15_0_x_to_15_1_0.sql

with 80 additions and 45 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