Merge OpenOLAT default branch to OpenOLAT qti with ee61c50070e5c8ff6a276ea07b015f43e6a3b9bd (4942cf46) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 4942cf46 authored 8 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with ee61c50070e5c8ff6a276ea07b015f43e6a3b9bd

parents db8debd7 0635f38e

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/controllers/linkchooser/FileLinkChooserController.java 27 additions, 29 deletions

...ns/controllers/linkchooser/FileLinkChooserController.java
src/main/java/org/olat/core/commons/controllers/linkchooser/_content/filechooser.html 8 additions, 4 deletions

...commons/controllers/linkchooser/_content/filechooser.html
src/main/java/org/olat/core/commons/modules/bc/FileCopyController.java 2 additions, 2 deletions

.../org/olat/core/commons/modules/bc/FileCopyController.java
src/main/java/org/olat/core/commons/modules/bc/FileSelection.java 6 additions, 6 deletions

.../java/org/olat/core/commons/modules/bc/FileSelection.java
src/main/java/org/olat/core/commons/modules/bc/FileUploadController.java 357 additions, 314 deletions

...rg/olat/core/commons/modules/bc/FileUploadController.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdUpload.java 18 additions, 13 deletions

.../org/olat/core/commons/modules/bc/commands/CmdUpload.java
src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoFormController.java 23 additions, 21 deletions

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

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

.../commons/modules/bc/meta/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/modules/bc/version/VersionCommentController.java 1 addition, 1 deletion

.../commons/modules/bc/version/VersionCommentController.java
src/main/java/org/olat/core/commons/modules/bc/version/_content/revisions.html 1 addition, 1 deletion

...t/core/commons/modules/bc/version/_content/revisions.html
src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java 8 additions, 0 deletions

...ui/components/form/flexible/impl/FormBasicController.java
src/main/java/org/olat/core/util/FileUtils.java 2 additions, 0 deletions

src/main/java/org/olat/core/util/FileUtils.java
src/main/java/org/olat/core/util/vfs/VirtualContainer.java 9 additions, 8 deletions

src/main/java/org/olat/core/util/vfs/VirtualContainer.java
src/main/java/org/olat/course/MergedCourseContainer.java 46 additions, 40 deletions

src/main/java/org/olat/course/MergedCourseContainer.java
src/main/java/org/olat/course/config/CourseConfig.java 20 additions, 5 deletions

src/main/java/org/olat/course/config/CourseConfig.java
src/main/java/org/olat/course/config/ui/CourseOptionsController.java 37 additions, 9 deletions

...va/org/olat/course/config/ui/CourseOptionsController.java
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...rg/olat/course/config/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...rg/olat/course/config/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java 5 additions, 5 deletions

...n/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java

with 574 additions and 458 deletions

Please register or to comment