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

cf50d22c

Commit cf50d22c authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents b9f57bc5 0921798d

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/CoursefolderWebDAVMergeSource.java 6 additions, 1 deletion

...n/java/org/olat/course/CoursefolderWebDAVMergeSource.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonEditMeetingsController.java 10 additions, 1 deletion

...bigbluebutton/ui/BigBlueButtonEditMeetingsController.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingTableModel.java 3 additions, 1 deletion

...ules/bigbluebutton/ui/BigBlueButtonMeetingTableModel.java
src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java 22 additions, 3 deletions

.../bigbluebutton/ui/EditBigBlueButtonMeetingController.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/qpool/ui/metadata/MetadataBulkChangeController.java 9 additions, 4 deletions

...dules/qpool/ui/metadata/MetadataBulkChangeController.java
src/main/java/org/olat/modules/taxonomy/ui/DeleteTaxonomyLevelController.java 21 additions, 5 deletions

...at/modules/taxonomy/ui/DeleteTaxonomyLevelController.java
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties 5 additions, 2 deletions

...olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties 4 additions, 1 deletion

...olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/repository/RepositoryManager.java 12 additions, 5 deletions

src/main/java/org/olat/repository/RepositoryManager.java
src/test/java/org/olat/repository/RepositoryManagerTest.java 71 additions, 3 deletions

src/test/java/org/olat/repository/RepositoryManagerTest.java

with 165 additions and 26 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