Merge branch 'master' of (1e93dd4b) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 1e93dd4b authored 5 years ago by aboeckle

Merge branch 'master' of

ssh://aboeckle@weboffice/home/aboeckle/repositories/OpenOLAT.git

parents 2d7c4621 53a85e0e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

NOTICE.TXT 2 additions, 1 deletion

NOTICE.TXT
src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html 2 additions, 0 deletions

...at/core/commons/fullWebApp/_content/fullwebapplayout.html
src/main/java/org/olat/core/gui/components/Window.java 23 additions, 13 deletions

src/main/java/org/olat/core/gui/components/Window.java
src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java 5 additions, 5 deletions

...java/org/olat/core/util/mail/manager/MailManagerImpl.java
src/main/java/org/olat/course/assessment/manager/AssessmentToolManagerImpl.java 1 addition, 1 deletion

.../course/assessment/manager/AssessmentToolManagerImpl.java
src/main/java/org/olat/course/nodes/LiveStreamCourseNode.java 4 additions, 1 deletion

...main/java/org/olat/course/nodes/LiveStreamCourseNode.java
src/main/java/org/olat/course/nodes/livestream/LiveStreamModule.java 51 additions, 0 deletions

...va/org/olat/course/nodes/livestream/LiveStreamModule.java
src/main/java/org/olat/course/nodes/livestream/LiveStreamSecurityCallback.java 3 additions, 1 deletion

...t/course/nodes/livestream/LiveStreamSecurityCallback.java
src/main/java/org/olat/course/nodes/livestream/LiveStreamSecurityCallbackFactory.java 15 additions, 2 deletions

...e/nodes/livestream/LiveStreamSecurityCallbackFactory.java
src/main/java/org/olat/course/nodes/livestream/LiveStreamService.java 17 additions, 0 deletions

...a/org/olat/course/nodes/livestream/LiveStreamService.java
src/main/java/org/olat/course/nodes/livestream/manager/LiveStreamServiceImpl.java 37 additions, 1 deletion

...ourse/nodes/livestream/manager/LiveStreamServiceImpl.java
src/main/java/org/olat/course/nodes/livestream/manager/LiveStreamStatisticDAO.java 62 additions, 0 deletions

...urse/nodes/livestream/manager/LiveStreamStatisticDAO.java
src/main/java/org/olat/course/nodes/livestream/paella/PaellaFactory.java 117 additions, 0 deletions

...rg/olat/course/nodes/livestream/paella/PaellaFactory.java
src/main/java/org/olat/course/nodes/livestream/paella/PaellaMapper.java 247 additions, 0 deletions

...org/olat/course/nodes/livestream/paella/PaellaMapper.java
src/main/java/org/olat/course/nodes/livestream/paella/PlayerProfile.java 84 additions, 0 deletions

...rg/olat/course/nodes/livestream/paella/PlayerProfile.java
src/main/java/org/olat/course/nodes/livestream/paella/Source.java 49 additions, 0 deletions

.../java/org/olat/course/nodes/livestream/paella/Source.java
src/main/java/org/olat/course/nodes/livestream/paella/Sources.java 52 additions, 0 deletions

...java/org/olat/course/nodes/livestream/paella/Sources.java
src/main/java/org/olat/course/nodes/livestream/paella/Stream.java 49 additions, 0 deletions

.../java/org/olat/course/nodes/livestream/paella/Stream.java
src/main/java/org/olat/course/nodes/livestream/paella/Streams.java 40 additions, 0 deletions

...java/org/olat/course/nodes/livestream/paella/Streams.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamAdminController.java 62 additions, 1 deletion

...course/nodes/livestream/ui/LiveStreamAdminController.java

with 922 additions and 26 deletions

Please register or to comment