[Pkg-owncloud-commits] [owncloud] 32/90: Merge pull request #12643 from owncloud/ldap-user-cleanup-stable7

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit fb63e75743cae8de15372df88f1f04bf73404981
Merge: 4c0af1b dd18f96
Author: blizzz <blizzz at owncloud.com>
Date:   Fri Dec 19 19:04:50 2014 +0100

    Merge pull request #12643 from owncloud/ldap-user-cleanup-stable7
    
    LDAP User Cleanup - stable7

 apps/user_ldap/ajax/clearMappings.php            |   3 +-
 apps/user_ldap/ajax/deleteConfiguration.php      |   3 +-
 apps/user_ldap/ajax/getNewServerConfigPrefix.php |   3 +-
 apps/user_ldap/appinfo/app.php                   |  14 +-
 apps/user_ldap/appinfo/register_command.php      |  13 ++
 apps/user_ldap/appinfo/update.php                |   3 +-
 apps/user_ldap/appinfo/version                   |   2 +-
 apps/user_ldap/command/checkuser.php             | 129 +++++++++++++
 apps/user_ldap/command/search.php                |   3 +-
 apps/user_ldap/command/setconfig.php             |   3 +-
 apps/user_ldap/command/showconfig.php            |   3 +-
 apps/user_ldap/command/showremnants.php          |  81 ++++++++
 apps/user_ldap/command/testconfig.php            |   3 +-
 apps/user_ldap/lib/access.php                    |  47 ++---
 apps/user_ldap/lib/connection.php                |   3 +-
 apps/user_ldap/lib/helper.php                    |  26 ++-
 apps/user_ldap/lib/jobs.php                      |   3 +-
 apps/user_ldap/lib/jobs/cleanup.php              | 227 +++++++++++++++++++++++
 apps/user_ldap/lib/user/deletedusersindex.php    | 125 +++++++++++++
 apps/user_ldap/lib/user/iusertools.php           |   3 +
 apps/user_ldap/lib/user/manager.php              |  63 +++++--
 apps/user_ldap/lib/user/offlineuser.php          | 217 ++++++++++++++++++++++
 apps/user_ldap/lib/user/user.php                 |  25 +++
 apps/user_ldap/lib/wizard.php                    |   3 +-
 apps/user_ldap/settings.php                      |   5 +-
 apps/user_ldap/tests/helper.php                  |   3 +-
 apps/user_ldap/tests/jobs/cleanup.php            | 155 ++++++++++++++++
 apps/user_ldap/tests/user/manager.php            |   2 +-
 apps/user_ldap/tests/user_ldap.php               |  20 +-
 apps/user_ldap/user_ldap.php                     | 116 ++++++++++--
 apps/user_ldap/user_proxy.php                    |  14 +-
 config/config.sample.php                         |  16 +-
 core/command/user/delete.php                     |  36 ++++
 core/register_command.php                        |   1 +
 lib/private/preferences.php                      |  11 +-
 lib/private/user.php                             |   2 +-
 36 files changed, 1280 insertions(+), 106 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git