Merge remote-tracking branch 'upstream/OpenOLAT_15.2' into OpenOLAT_15.2.uibk (f515aff7) · 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

f515aff7

Commit f515aff7 authored 4 years ago by andy parschalk

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/OpenOLAT_15.2' into OpenOLAT_15.2.uibk

parents fc89e2b5 79dcdc50

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/basesecurity/manager/AuthenticationDAO.java 11 additions, 0 deletions

...java/org/olat/basesecurity/manager/AuthenticationDAO.java
src/main/java/org/olat/basesecurity/manager/IdentityDAO.java 7 additions, 1 deletion

src/main/java/org/olat/basesecurity/manager/IdentityDAO.java
src/main/java/org/olat/course/member/wizard/ImportMemberByUsernamesController.java 2 additions, 0 deletions

...urse/member/wizard/ImportMemberByUsernamesController.java
src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java 21 additions, 11 deletions

...main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java
src/main/resources/serviceconfig/olat.properties 3 additions, 3 deletions

src/main/resources/serviceconfig/olat.properties
src/test/java/org/olat/basesecurity/manager/AuthenticationDAOTest.java 14 additions, 0 deletions

.../org/olat/basesecurity/manager/AuthenticationDAOTest.java

with 58 additions and 15 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