Merge remote-tracking branch 'origin/OpenOLAT_15.1' (18f45f60) · 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

18f45f60

Commit 18f45f60 authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_15.1'

parents 18d8c189 381dc778

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti/editor/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../org/olat/ims/qti/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/qpool/ui/ConversionConfirmationController.java 22 additions, 5 deletions

...at/modules/qpool/ui/ConversionConfirmationController.java
src/main/java/org/olat/modules/qpool/ui/QuestionItemDetailsController.java 24 additions, 15 deletions

.../olat/modules/qpool/ui/QuestionItemDetailsController.java
src/main/java/org/olat/modules/qpool/ui/_content/item_details.html 2 additions, 0 deletions

...java/org/olat/modules/qpool/ui/_content/item_details.html
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/user/ui/admin/UserSearchDataSource.java 6 additions, 4 deletions

...ain/java/org/olat/user/ui/admin/UserSearchDataSource.java

with 60 additions and 26 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