Merge OpenOLAT 11.4 to OpenOLATpro default branch with 206694184e65e8a28efb3b729237da4958c61c7e (3febd1cf) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 3febd1cf authored 8 years ago by srosse

Browse files

Merge OpenOLAT 11.4 to OpenOLATpro default branch with 206694184e65e8a28efb3b729237da4958c61c7e

parents a24ef70d 2b852810

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java 1 addition, 1 deletion

...ntrollers/filechooser/LinkFileCombiCalloutController.java
src/main/java/org/olat/core/commons/controllers/linkchooser/FileLinkChooserController.java 5 additions, 3 deletions

...ns/controllers/linkchooser/FileLinkChooserController.java
src/main/java/org/olat/core/commons/controllers/linkchooser/LinkChooserController.java 3 additions, 2 deletions

...ommons/controllers/linkchooser/LinkChooserController.java
src/main/java/org/olat/core/commons/controllers/linkchooser/MediaChooserController.java 1 addition, 1 deletion

...mmons/controllers/linkchooser/MediaChooserController.java
src/main/java/org/olat/core/commons/modules/bc/FileCopyController.java 1 addition, 1 deletion

.../org/olat/core/commons/modules/bc/FileCopyController.java
src/main/java/org/olat/core/commons/modules/bc/FileUploadController.java 64 additions, 21 deletions

...rg/olat/core/commons/modules/bc/FileUploadController.java
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

.../core/commons/modules/bc/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

.../core/commons/modules/bc/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/modules/bc/commands/CmdUpload.java 1 addition, 1 deletion

.../org/olat/core/commons/modules/bc/commands/CmdUpload.java
src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java 3 additions, 1 deletion

...olat/core/gui/components/form/flexible/FormUIFactory.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 14 additions, 1 deletion

...lexible/impl/elements/richText/RichTextConfiguration.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java 3 additions, 2 deletions

...ible/impl/elements/richText/RichTextElementComponent.java
src/main/java/org/olat/ims/qti21/pool/QTI12To21Converter.java 10 additions, 1 deletion

...main/java/org/olat/ims/qti21/pool/QTI12To21Converter.java
src/main/java/org/olat/ims/qti21/pool/QTI12To21HtmlHandler.java 14 additions, 0 deletions

...in/java/org/olat/ims/qti21/pool/QTI12To21HtmlHandler.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBNumericalEntrySettingsController.java 12 additions, 0 deletions

...tor/interactions/FIBNumericalEntrySettingsController.java
src/main/java/org/olat/modules/dialog/DialogElementsController.java 2 additions, 2 deletions

...ava/org/olat/modules/dialog/DialogElementsController.java
src/main/java/org/olat/modules/wiki/WikiFileUploadController.java 1 addition, 1 deletion

.../java/org/olat/modules/wiki/WikiFileUploadController.java

with 143 additions and 38 deletions

Please register or to comment