Merge branch 'grueneedv-master' (766699a1) · Commits · Perun / Perun ProxyIdP / v1 / simplesamlphp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

simplesamlphp
- Activity
- Members
- Labels
- Jira
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

766699a1

Commit 766699a1 authored 8 years ago by Thijs Kinkhorst

Downloads
- Plain Diff

Merge branch 'grueneedv-master'

parents c84660c3 61d96d6e

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

lib/SimpleSAML/Auth/LDAP.php 60 additions, 55 deletions

lib/SimpleSAML/Auth/LDAP.php
modules/ldap/docs/ldap.md 14 additions, 1 deletion

modules/ldap/docs/ldap.md
modules/ldap/lib/Auth/Process/AttributeAddFromLDAP.php 9 additions, 7 deletions

modules/ldap/lib/Auth/Process/AttributeAddFromLDAP.php
modules/ldap/lib/Auth/Process/AttributeAddUsersGroups.php 308 additions, 283 deletions

modules/ldap/lib/Auth/Process/AttributeAddUsersGroups.php
modules/ldap/lib/Auth/Process/BaseFilter.php 267 additions, 266 deletions

modules/ldap/lib/Auth/Process/BaseFilter.php
modules/ldap/lib/Auth/Source/LDAP.php 43 additions, 40 deletions

modules/ldap/lib/Auth/Source/LDAP.php
modules/ldap/lib/Auth/Source/LDAPMulti.php 111 additions, 108 deletions

modules/ldap/lib/Auth/Source/LDAPMulti.php
modules/ldap/lib/ConfigHelper.php 274 additions, 269 deletions

modules/ldap/lib/ConfigHelper.php

with 1086 additions and 1029 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