Merge remote-tracking branch 'origin/OpenOLAT_13.2' (4ad74cd0) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 4ad74cd0 authored 5 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_13.2'

parents 5f7fcae5 1ab75470

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/core/gui/components/form/flexible/impl/elements/table/DefaultFlexiColumnModel.java 32 additions, 21 deletions

...flexible/impl/elements/table/DefaultFlexiColumnModel.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiColumnDef.java 8 additions, 0 deletions

...nts/form/flexible/impl/elements/table/FlexiColumnDef.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiColumnModel.java 2 additions, 0 deletions

...s/form/flexible/impl/elements/table/FlexiColumnModel.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableClassicRenderer.java 17 additions, 1 deletion

...exible/impl/elements/table/FlexiTableClassicRenderer.java
src/main/java/org/olat/course/assessment/bulk/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...t/course/assessment/bulk/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java 3 additions, 1 deletion

.../assessment/ui/tool/IdentityListCourseNodeController.java
src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java 13 additions, 2 deletions

.../assessment/ui/tool/IdentityListCourseNodeTableModel.java
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_it.properties 0 additions, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion

...se/assessment/ui/tool/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/SurveyCourseNode.java 11 additions, 0 deletions

src/main/java/org/olat/course/nodes/SurveyCourseNode.java
src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java 1 addition, 0 deletions

...t/course/nodes/iq/IQIdentityListCourseNodeController.java
src/main/java/org/olat/modules/portfolio/ui/shared/SharedBindersController.java 2 additions, 2 deletions

.../modules/portfolio/ui/shared/SharedBindersController.java
src/main/java/org/olat/modules/portfolio/ui/shared/SharedPagesController.java 1 addition, 1 deletion

...at/modules/portfolio/ui/shared/SharedPagesController.java
src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java 1 addition, 1 deletion

...org/olat/modules/qpool/ui/AbstractItemListController.java
src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java 5 additions, 1 deletion

.../olat/repository/ui/RepositoryEntryRuntimeController.java
src/main/java/org/olat/repository/ui/author/AuthorListController.java 1 addition, 1 deletion

...a/org/olat/repository/ui/author/AuthorListController.java
src/test/java/org/olat/selenium/page/qti/QTI21Page.java 1 addition, 3 deletions

src/test/java/org/olat/selenium/page/qti/QTI21Page.java

with 103 additions and 41 deletions

Please register or to comment