Merge OpenOLAT 10.3 to OpenOLAT default with 3e28fa86416f480eecec3fc63cf078238d3e624c (ec61df04) · 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

ec61df04

Commit ec61df04 authored 9 years ago by gnaegi

Downloads
- Plain Diff

Merge OpenOLAT 10.3 to OpenOLAT default with 3e28fa86416f480eecec3fc63cf078238d3e624c

parents a529025d 44ef969a

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/scorm/ScormRunController.java 2 additions, 5 deletions

.../java/org/olat/course/nodes/scorm/ScormRunController.java
src/main/java/org/olat/modules/scorm/ScormAPICallback.java 0 additions, 2 deletions

src/main/java/org/olat/modules/scorm/ScormAPICallback.java
src/main/webapp/static/js/openolat/scormApiAdapter.js 1 addition, 1 deletion

src/main/webapp/static/js/openolat/scormApiAdapter.js
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.js 2 additions, 2 deletions

...tic/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.js
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.min.js 1 addition, 1 deletion

...js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.min.js
src/main/webapp/static/movie/flashmediaelement.swf 0 additions, 0 deletions

src/main/webapp/static/movie/flashmediaelement.swf
src/main/webapp/static/movie/mediaelement-and-player.min.js 3 additions, 3 deletions

src/main/webapp/static/movie/mediaelement-and-player.min.js
src/main/webapp/static/movie/mediaelementplayer.min.css 1 addition, 1 deletion

src/main/webapp/static/movie/mediaelementplayer.min.css

with 10 additions and 15 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