Johannes Meyer 2917f352b5 Merge branch 'master' into bugfix/unreliable-attribute-ambiguity-check-10567 ...

Conflicts:
	library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
	library/Icinga/Protocol/Ldap/LdapConnection.php

2015-11-11 11:53:19 +01:00

..

User

LdapUserBackend: Utilize $virtualTables

2015-11-10 09:56:27 +01:00

UserGroup

Merge branch 'master' into bugfix/unreliable-attribute-ambiguity-check-10567

2015-11-11 11:53:19 +01:00

AdmissionLoader.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

Auth.php

Let external auth win over session auth and session auth over http auth

2015-07-30 14:50:05 +02:00

AuthChain.php

lib: Add AuthChain::setSkipExternalBackends() in favor of setIteratorMode()

2015-07-29 16:18:30 +02:00

Authenticatable.php

lib: Move UserBackendInterface::authenticate() to new interface Authenticatable

2015-07-29 09:25:14 +02:00