Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2 (b091d4b2) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit b091d4b2 authored 5 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

parents b4d60557 4705f7bb

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/ims/qti21/ui/assessment/CorrectionIdentityInteractionsController.java 4 additions, 3 deletions

.../assessment/CorrectionIdentityInteractionsController.java
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

.../ims/qti21/ui/assessment/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

.../ims/qti21/ui/assessment/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

.../ims/qti21/ui/assessment/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_it.properties 1 addition, 0 deletions

.../ims/qti21/ui/assessment/_i18n/LocalStrings_it.properties
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...s/qti21/ui/assessment/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_zh_CN.properties 1 addition, 0 deletions

...s/qti21/ui/assessment/_i18n/LocalStrings_zh_CN.properties
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectComponent.java 9 additions, 0 deletions

...at/ims/qti21/ui/components/AssessmentObjectComponent.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectComponentRenderer.java 2 additions, 0 deletions

...ti21/ui/components/AssessmentObjectComponentRenderer.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectFormItem.java 8 additions, 0 deletions

...lat/ims/qti21/ui/components/AssessmentObjectFormItem.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectVelocityRenderDecorator.java 52 additions, 0 deletions

...i/components/AssessmentObjectVelocityRenderDecorator.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentTestFormItem.java 13 additions, 1 deletion

.../olat/ims/qti21/ui/components/AssessmentTestFormItem.java
src/main/java/org/olat/ims/qti21/ui/components/_content/textEntryInteraction.html 6 additions, 0 deletions

...ms/qti21/ui/components/_content/textEntryInteraction.html
src/main/webapp/static/themes/light/modules/_qti21.scss 8 additions, 0 deletions

src/main/webapp/static/themes/light/modules/_qti21.scss
src/main/webapp/static/themes/light/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css
src/main/webapp/static/themes/light/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css.map
src/main/webapp/static/themes/light/theme_ie_completions.css 1 addition, 0 deletions

src/main/webapp/static/themes/light/theme_ie_completions.css
src/main/webapp/static/themes/openolat/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css
src/main/webapp/static/themes/openolat/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css.map
src/main/webapp/static/themes/openolat/theme_ie_completions.css 1 addition, 0 deletions

...in/webapp/static/themes/openolat/theme_ie_completions.css

with 114 additions and 8 deletions

Please register or to comment