Merge with e2608448a8919ba8473d9b0e798f2e129a9e266b (455d82d5) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 455d82d5 authored 8 years ago by lmihalkovic

Browse files

Merge with e2608448a8919ba8473d9b0e798f2e129a9e266b

parents 4afb9903 b6e62925

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/site/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

...a/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/services/commentAndRating/ui/UserCommentsAndRatingsController.java 2 additions, 0 deletions

...commentAndRating/ui/UserCommentsAndRatingsController.java
src/main/java/org/olat/core/commons/services/video/MovieService.java 17 additions, 0 deletions

...va/org/olat/core/commons/services/video/MovieService.java
src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java 36 additions, 0 deletions

...rg/olat/core/commons/services/video/MovieServiceImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/ExportableFlexiTableDataModelDelegate.java 5 additions, 5 deletions

...elements/table/ExportableFlexiTableDataModelDelegate.java
src/main/java/org/olat/core/util/Formatter.java 17 additions, 1 deletion

src/main/java/org/olat/core/util/Formatter.java
src/main/java/org/olat/course/nodes/scorm/ScormEditController.java 18 additions, 16 deletions

...java/org/olat/course/nodes/scorm/ScormEditController.java
src/main/java/org/olat/course/nodes/video/VideoEditController.java 10 additions, 1 deletion

...java/org/olat/course/nodes/video/VideoEditController.java
src/main/java/org/olat/course/nodes/video/VideoRunController.java 27 additions, 12 deletions

.../java/org/olat/course/nodes/video/VideoRunController.java
src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_de.properties 7 additions, 6 deletions

.../olat/course/nodes/video/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_en.properties 5 additions, 4 deletions

.../olat/course/nodes/video/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java 11 additions, 13 deletions

...java/org/olat/ims/qti/editor/QTIEditorMainController.java
src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingController.java 9 additions, 1 deletion

...rg/olat/modules/gotomeeting/ui/GoToMeetingController.java
src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingsController.java 1 addition, 1 deletion

...g/olat/modules/gotomeeting/ui/GoToMeetingsController.java
src/main/java/org/olat/modules/video/_spring/videoContext.xml 6 additions, 1 deletion

...main/java/org/olat/modules/video/_spring/videoContext.xml
src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java 6 additions, 0 deletions

...java/org/olat/modules/video/manager/VideoManagerImpl.java
src/main/java/org/olat/modules/video/site/VideoSite.java 86 additions, 0 deletions

src/main/java/org/olat/modules/video/site/VideoSite.java
src/main/java/org/olat/modules/video/site/VideoSiteDef.java 47 additions, 0 deletions

src/main/java/org/olat/modules/video/site/VideoSiteDef.java
src/main/java/org/olat/modules/video/ui/VideoListingController.java 134 additions, 0 deletions

...ava/org/olat/modules/video/ui/VideoListingController.java

with 446 additions and 61 deletions

Please register or to comment