Merge remote-tracking branch 'origin/OpenOLAT_14.1'
Showing
- src/main/java/org/olat/core/gui/control/generic/iframe/DeliveryOptionsConfigurationController.java 46 additions, 35 deletions...eneric/iframe/DeliveryOptionsConfigurationController.java
- src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 167 additions, 144 deletions...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
- src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDisplayController.java 2 additions, 4 deletions...e/gui/control/generic/iframe/IFrameDisplayController.java
- src/main/java/org/olat/core/gui/control/generic/iframe/SerializableIFrameDeliveryMapper.java 1 addition, 1 deletion...trol/generic/iframe/SerializableIFrameDeliveryMapper.java
- src/main/java/org/olat/core/gui/control/generic/iframe/_content/index.html 4 additions, 6 deletions.../olat/core/gui/control/generic/iframe/_content/index.html
- src/main/java/org/olat/course/nodes/scorm/ScormEditController.java 1 addition, 1 deletion...java/org/olat/course/nodes/scorm/ScormEditController.java
- src/main/java/org/olat/course/nodes/scorm/ScormRunController.java 4 additions, 4 deletions.../java/org/olat/course/nodes/scorm/ScormRunController.java
- src/main/java/org/olat/modules/portfolio/handler/EvaluationFormHandler.java 4 additions, 9 deletions...olat/modules/portfolio/handler/EvaluationFormHandler.java
- src/main/java/org/olat/modules/scorm/ScormAPIandDisplayController.java 7 additions, 15 deletions.../org/olat/modules/scorm/ScormAPIandDisplayController.java
- src/main/java/org/olat/modules/scorm/ScormMainManager.java 6 additions, 6 deletionssrc/main/java/org/olat/modules/scorm/ScormMainManager.java
- src/main/java/org/olat/modules/scorm/ScormRuntimeController.java 18 additions, 0 deletions...n/java/org/olat/modules/scorm/ScormRuntimeController.java
- src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties 1 addition, 1 deletion...java/org/olat/repository/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/repository/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion...java/org/olat/repository/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/repository/handlers/SCORMCPHandler.java 2 additions, 1 deletion...ain/java/org/olat/repository/handlers/SCORMCPHandler.java
Loading
Please register or sign in to comment