Merge remote-tracking branch 'upstream/master' (778dc67a) · 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

778dc67a

Commit 778dc67a authored 4 years ago by Andreas Parschalk

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master'

parents 0f0f46e2 3be89f43

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/course/nodes/OpencastCourseNode.java 2 additions, 2 deletions

src/main/java/org/olat/course/nodes/OpencastCourseNode.java
src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java 2 additions, 15 deletions

...at/course/nodes/opencast/ui/OpencastConfigController.java
src/main/java/org/olat/course/nodes/opencast/ui/OpencastRunController.java 119 additions, 0 deletions

.../olat/course/nodes/opencast/ui/OpencastRunController.java
src/main/java/org/olat/course/nodes/opencast/ui/_content/display.html 0 additions, 20 deletions

...a/org/olat/course/nodes/opencast/ui/_content/display.html
src/main/java/org/olat/course/nodes/opencast/ui/_content/run.html 23 additions, 0 deletions

.../java/org/olat/course/nodes/opencast/ui/_content/run.html
src/main/java/org/olat/modules/opencast/OpencastModule.java 0 additions, 17 deletions

src/main/java/org/olat/modules/opencast/OpencastModule.java
src/main/java/org/olat/modules/opencast/ui/OpencastAdminController.java 1 addition, 8 deletions

...org/olat/modules/opencast/ui/OpencastAdminController.java
src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_de.properties 0 additions, 1 deletion

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

...olat/modules/opencast/ui/_i18n/LocalStrings_en.properties
src/main/resources/serviceconfig/olat.properties 0 additions, 1 deletion

src/main/resources/serviceconfig/olat.properties

with 147 additions and 65 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