Merge remote-tracking branch 'upstream/OpenOLAT_15.1' into OpenOLAT_15.1.uibk (70f9e883) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 70f9e883 authored 4 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_15.1' into OpenOLAT_15.1.uibk

parents 0a6bf370 5fcd427d

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/AdminModuleDispatcher.java 15 additions, 21 deletions

src/main/java/org/olat/admin/AdminModuleDispatcher.java
src/main/java/org/olat/core/commons/services/taskexecutor/_spring/taskExecutorCorecontext.xml 1 addition, 1 deletion

...services/taskexecutor/_spring/taskExecutorCorecontext.xml
src/main/java/org/olat/core/commons/services/taskexecutor/manager/TaskExecutorManagerImpl.java 4 additions, 2 deletions

...ervices/taskexecutor/manager/TaskExecutorManagerImpl.java
src/main/java/org/olat/core/gui/components/link/LinkRenderer.java 3 additions, 1 deletion

.../java/org/olat/core/gui/components/link/LinkRenderer.java
src/main/java/org/olat/core/servlets/StaticServlet.java 2 additions, 2 deletions

src/main/java/org/olat/core/servlets/StaticServlet.java
src/main/java/org/olat/core/util/mail/_spring/mailContext.xml 2 additions, 1 deletion

...main/java/org/olat/core/util/mail/_spring/mailContext.xml
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...rg/olat/course/config/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/VideoCourseNode.java 32 additions, 7 deletions

src/main/java/org/olat/course/nodes/VideoCourseNode.java
src/main/java/org/olat/course/nodes/livestream/manager/LiveStreamServiceImpl.java 9 additions, 1 deletion

...ourse/nodes/livestream/manager/LiveStreamServiceImpl.java
src/main/java/org/olat/course/nodes/video/VideoEditController.java 5 additions, 25 deletions

...java/org/olat/course/nodes/video/VideoEditController.java
src/main/java/org/olat/course/nodes/video/VideoRunController.java 1 addition, 19 deletions

.../java/org/olat/course/nodes/video/VideoRunController.java
src/main/java/org/olat/course/run/CourseRuntimeController.java 28 additions, 1 deletion

...ain/java/org/olat/course/run/CourseRuntimeController.java
src/main/java/org/olat/modules/video/ui/VideoDisplayController.java 3 additions, 16 deletions

...ava/org/olat/modules/video/ui/VideoDisplayController.java
src/main/java/org/olat/modules/video/ui/VideoDisplayOptions.java 1 addition, 12 deletions

...n/java/org/olat/modules/video/ui/VideoDisplayOptions.java
src/main/java/org/olat/modules/video/ui/VideoListingController.java 1 addition, 1 deletion

...ava/org/olat/modules/video/ui/VideoListingController.java
src/main/java/org/olat/modules/webFeed/dispatching/FeedMediaDispatcher.java 6 additions, 1 deletion

...olat/modules/webFeed/dispatching/FeedMediaDispatcher.java
src/main/java/org/olat/restapi/repository/course/CoursesWebService.java 4 additions, 1 deletion

...org/olat/restapi/repository/course/CoursesWebService.java
src/main/java/org/olat/user/ui/admin/lifecycle/UserAdminLifecycleConfigurationController.java 1 addition, 1 deletion

.../lifecycle/UserAdminLifecycleConfigurationController.java
src/main/java/org/olat/user/ui/admin/lifecycle/_i18n/LocalStrings_de.properties 5 additions, 4 deletions

.../user/ui/admin/lifecycle/_i18n/LocalStrings_de.properties
src/main/java/org/olat/user/ui/admin/lifecycle/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

.../user/ui/admin/lifecycle/_i18n/LocalStrings_en.properties

with 125 additions and 118 deletions

Please register or to comment