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

2f5e1961

Commit 2f5e1961 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents d944c993 f216041e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java 29 additions, 15 deletions

...n/java/org/olat/admin/user/UsermanagerUserSearchForm.java
src/main/java/org/olat/admin/user/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...java/org/olat/admin/user/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/user/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...java/org/olat/admin/user/_i18n/LocalStrings_en.properties
src/main/java/org/olat/basesecurity/SearchIdentityParams.java 18 additions, 0 deletions

...main/java/org/olat/basesecurity/SearchIdentityParams.java
src/main/java/org/olat/basesecurity/manager/IdentityPowerSearchQueriesImpl.java 33 additions, 12 deletions

.../basesecurity/manager/IdentityPowerSearchQueriesImpl.java

with 84 additions and 27 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