Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1 (0d30587d) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

0d30587d

Commit 0d30587d authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1

parents 1a616ee2 077c47c4

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 2 additions, 0 deletions

pom.xml
src/main/java/org/olat/ims/qti21/ui/editor/ItemSessionControlController.java 154 additions, 6 deletions

...lat/ims/qti21/ui/editor/ItemSessionControlController.java
src/main/java/org/olat/ims/qti21/ui/editor/_content/max_attempts_warning.html 11 additions, 0 deletions

...at/ims/qti21/ui/editor/_content/max_attempts_warning.html
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 5 additions, 0 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 5 additions, 0 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/webapp/static/themes/light/modules/_qti21.scss 4 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/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/test/resources/arquillian.xml 1 addition, 0 deletions

src/test/resources/arquillian.xml

with 186 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment