stable

Clone or download

Read-only

Merge 'gerrit #10047' into stable/master

* commit '4d360105da': request #10861 Autocomplete must returns LDAP and local users Change-Id: Ief3f4b466a90c232ab912f2c0cc62b4b75cd9560

Modified Files

Name
M plugins/ldap/include/LDAP_UserManager.class.php +56 −14 Go to diff View file
M plugins/ldap/include/autoload.php +4 −2 Go to diff View file
A plugins/ldap/include/exception/IdentifierTypeNotFoundException.php +28 −0 Go to diff View file
A plugins/ldap/include/exception/IdentifierTypeNotRecognizedException.php +28 −0 Go to diff View file
M plugins/ldap/include/ldapPlugin.class.php +27 −45 Go to diff View file
M src/common/dao/UserDao.class.php +1 −1 Go to diff View file
M src/www/user/autocomplete.php +29 −13 Go to diff View file