Merge remote-tracking branch 'origin/OpenOLAT_15.2' (715637a2) · 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

715637a2

Commit 715637a2 authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents 3260067a c8027477

No related branches found

No related tags found

Loading

Changes 48

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/search/ui/_i18n/LocalStrings_pt_BR.properties 3 additions, 1 deletion

...va/org/olat/search/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_pt_BR.properties 4 additions, 1 deletion

...user/propertyhandlers/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/user/ui/admin/_i18n/LocalStrings_pt_BR.properties 12 additions, 1 deletion

...rg/olat/user/ui/admin/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/user/ui/admin/authentication/_i18n/LocalStrings_pt_BR.properties 11 additions, 0 deletions

.../admin/authentication/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/user/ui/admin/lifecycle/_i18n/LocalStrings_pt_BR.properties 38 additions, 1 deletion

...er/ui/admin/lifecycle/_i18n/LocalStrings_pt_BR.properties
src/main/resources/log4j2.xml 6 additions, 0 deletions

src/main/resources/log4j2.xml
src/test/java/org/olat/selenium/page/qti/QTI21ConfigurationCEPage.java 8 additions, 6 deletions

.../org/olat/selenium/page/qti/QTI21ConfigurationCEPage.java
src/test/resources/arquillian.xml 1 addition, 1 deletion

src/test/resources/arquillian.xml

with 83 additions and 11 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