Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (00c97521) · 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

00c97521

Commit 00c97521 authored 6 years ago by srosse

Downloads
- Plain Diff

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents f905c1e9 4cac248b

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/UserSearchFlexiController.java 12 additions, 11 deletions

...n/java/org/olat/admin/user/UserSearchFlexiController.java
src/main/java/org/olat/admin/user/UserSearchListProvider.java 10 additions, 4 deletions

...main/java/org/olat/admin/user/UserSearchListProvider.java
src/main/java/org/olat/basesecurity/BaseSecurity.java 3 additions, 1 deletion

src/main/java/org/olat/basesecurity/BaseSecurity.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 12 additions, 2 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/modules/quality/ui/DataCollectionConfigurationController.java 2 additions, 3 deletions

...les/quality/ui/DataCollectionConfigurationController.java
src/main/java/org/olat/modules/quality/ui/TopicIdentitySearchController.java 72 additions, 0 deletions

...lat/modules/quality/ui/TopicIdentitySearchController.java
src/main/java/org/olat/modules/quality/ui/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

.../olat/modules/quality/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/quality/ui/_i18n/LocalStrings_en.properties 5 additions, 5 deletions

.../olat/modules/quality/ui/_i18n/LocalStrings_en.properties

with 119 additions and 29 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