Merge with cb059b86daad8f35a865962706e5dcf5a5e3e425 (02afc3ea) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 02afc3ea authored 9 years ago by dfurrer

Browse files

Merge with cb059b86daad8f35a865962706e5dcf5a5e3e425

parents 1ae35e92 e2ef80c5

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/layout/LayoutAdminController.java 1 addition, 1 deletion

...ain/java/org/olat/admin/layout/LayoutAdminController.java
src/main/java/org/olat/commons/calendar/ui/ImportCalendarFileController.java 1 addition, 1 deletion

...lat/commons/calendar/ui/ImportCalendarFileController.java
src/main/java/org/olat/commons/calendar/ui/InjectCalendarFileController.java 1 addition, 1 deletion

...lat/commons/calendar/ui/InjectCalendarFileController.java
src/main/java/org/olat/core/commons/modules/bc/FileUploadController.java 1 addition, 1 deletion

...rg/olat/core/commons/modules/bc/FileUploadController.java
src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java 4 additions, 4 deletions

...olat/core/gui/components/form/flexible/FormUIFactory.java
src/main/java/org/olat/core/gui/components/form/flexible/elements/FileElement.java 4 additions, 0 deletions

...re/gui/components/form/flexible/elements/FileElement.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementComponent.java 6 additions, 0 deletions

...nts/form/flexible/impl/elements/FileElementComponent.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementEvent.java 40 additions, 0 deletions

...ponents/form/flexible/impl/elements/FileElementEvent.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementImpl.java 118 additions, 49 deletions

...mponents/form/flexible/impl/elements/FileElementImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java 27 additions, 8 deletions

...ents/form/flexible/impl/elements/FileElementRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...m/flexible/impl/elements/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...m/flexible/impl/elements/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/util/i18n/devtools/TranslationDevController.java 19 additions, 0 deletions

...lat/core/util/i18n/devtools/TranslationDevController.java
src/main/java/org/olat/core/util/i18n/ui/I18nConfigSubImportLangController.java 1 addition, 1 deletion

.../core/util/i18n/ui/I18nConfigSubImportLangController.java
src/main/java/org/olat/course/assessment/bulk/DataStepForm.java 1 addition, 1 deletion

...in/java/org/olat/course/assessment/bulk/DataStepForm.java
src/main/java/org/olat/course/certificate/ui/CertificateChooserController.java 1 addition, 1 deletion

...t/course/certificate/ui/CertificateChooserController.java
src/main/java/org/olat/course/certificate/ui/UploadCertificateController.java 1 addition, 1 deletion

...at/course/certificate/ui/UploadCertificateController.java
src/main/java/org/olat/course/config/ui/courselayout/CourseLayoutGeneratorController.java 1 addition, 1 deletion

...nfig/ui/courselayout/CourseLayoutGeneratorController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckboxEditController.java 1 addition, 1 deletion

...a/org/olat/course/nodes/cl/ui/CheckboxEditController.java
src/main/java/org/olat/course/nodes/gta/ui/DocumentUploadController.java 1 addition, 1 deletion

...rg/olat/course/nodes/gta/ui/DocumentUploadController.java

with 233 additions and 72 deletions

Please register or to comment