Merge OpenOLAT 11.2 to OpenOLAT default branch with ecdff80e3b0447eaf586aedc67ef5ee6f8366edd (b4ed2c86) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit b4ed2c86 authored 8 years ago by srosse

Browse files

Merge OpenOLAT 11.2 to OpenOLAT default branch with ecdff80e3b0447eaf586aedc67ef5ee6f8366edd

parents 9b38b8ee b66e732b

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/quota/GenericQuotaEditController.java 2 additions, 2 deletions

...java/org/olat/admin/quota/GenericQuotaEditController.java
src/main/java/org/olat/admin/quota/GenericQuotaViewController.java 7 additions, 9 deletions

...java/org/olat/admin/quota/GenericQuotaViewController.java
src/main/java/org/olat/admin/quota/QuotaManagerImpl.java 9 additions, 2 deletions

src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
src/main/java/org/olat/admin/quota/_content/edit.html 6 additions, 0 deletions

src/main/java/org/olat/admin/quota/_content/edit.html
src/main/java/org/olat/admin/quota/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...ava/org/olat/admin/quota/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/quota/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...ava/org/olat/admin/quota/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/gui/components/form/flexible/elements/MultipleSelectionElement.java 15 additions, 4 deletions

...ents/form/flexible/elements/MultipleSelectionElement.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/MultipleSelectionElementImpl.java 40 additions, 17 deletions

.../flexible/impl/elements/MultipleSelectionElementImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/MultipleSelectionRenderer.java 11 additions, 0 deletions

...orm/flexible/impl/elements/MultipleSelectionRenderer.java
src/main/java/org/olat/core/gui/components/stack/BreadcrumbedStackedPanel.java 6 additions, 5 deletions

...t/core/gui/components/stack/BreadcrumbedStackedPanel.java
src/main/java/org/olat/core/gui/components/stack/PopEvent.java 9 additions, 2 deletions

...ain/java/org/olat/core/gui/components/stack/PopEvent.java
src/main/java/org/olat/core/util/vfs/QuotaManager.java 3 additions, 3 deletions

src/main/java/org/olat/core/util/vfs/QuotaManager.java
src/main/java/org/olat/course/assessment/ui/tool/AssessmentToolController.java 3 additions, 1 deletion

...t/course/assessment/ui/tool/AssessmentToolController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListAssessmentController.java 21 additions, 4 deletions

...lat/course/nodes/cl/ui/CheckListAssessmentController.java
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentItemEditorController.java 1 addition, 1 deletion

...t/ims/qti21/ui/editor/AssessmentItemEditorController.java
src/main/java/org/olat/modules/iq/IQDisplayController.java 2 additions, 2 deletions

src/main/java/org/olat/modules/iq/IQDisplayController.java
src/main/java/org/olat/repository/RepositoryManager.java 1 addition, 1 deletion

src/main/java/org/olat/repository/RepositoryManager.java
src/main/java/org/olat/repository/ui/author/AuthorDeletedListController.java 14 additions, 8 deletions

...lat/repository/ui/author/AuthorDeletedListController.java
src/main/java/org/olat/repository/ui/author/ConfirmRestoreController.java 1 addition, 0 deletions

...g/olat/repository/ui/author/ConfirmRestoreController.java

with 154 additions and 62 deletions

Please register or to comment