Merge OpenOLAT91 to OpenOLAT default with 99372bd64b6936b4dadc1df138b4cf247e76a3c6 (a5f9ff04) · 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

a5f9ff04

Commit a5f9ff04 authored 11 years ago by gnaegi

Downloads
- Plain Diff

Merge OpenOLAT91 to OpenOLAT default with 99372bd64b6936b4dadc1df138b4cf247e76a3c6

parents 2942d829 5d306a65

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/core/commons/modules/glossary/GlossaryMainController.java 1 addition, 2 deletions

...core/commons/modules/glossary/GlossaryMainController.java
src/main/java/org/olat/ldap/LDAPLoginManagerImpl.java 36 additions, 9 deletions

src/main/java/org/olat/ldap/LDAPLoginManagerImpl.java
src/main/java/org/olat/ldap/LDAPLoginModule.java 20 additions, 6 deletions

src/main/java/org/olat/ldap/LDAPLoginModule.java
src/main/java/org/olat/ldap/_spring/ldapContext.xml 1 addition, 1 deletion

src/main/java/org/olat/ldap/_spring/ldapContext.xml
src/main/resources/serviceconfig/olat.properties 4 additions, 0 deletions

src/main/resources/serviceconfig/olat.properties

with 62 additions and 18 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