[Pkg-owncloud-commits] [owncloud] 207/239: Merge branch 'master' into encryption_initial_enc_indicator

[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 1065c3354326149022eaffe50c86c94ac226b620
Merge: 060e0ad 40231c0
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Nov 27 16:44:06 2013 +0100

    Merge branch 'master' into encryption_initial_enc_indicator

 apps/files/index.php                               |   1 -
 apps/files_encryption/lib/helper.php               |  44 +++++-
 apps/files_encryption/lib/keymanager.php           |  38 +++--
 apps/files_encryption/lib/proxy.php                |  16 +--
 apps/files_encryption/lib/stream.php               |  27 ++--
 apps/files_encryption/lib/util.php                 |  86 +++++------
 apps/files_encryption/tests/crypt.php              |  16 ++-
 apps/files_encryption/tests/keymanager.php         |   4 +-
 apps/files_sharing/public.php                      |   3 -
 apps/user_ldap/ajax/wizard.php                     |   6 +
 apps/user_ldap/group_proxy.php                     |   5 +-
 apps/user_ldap/js/settings.js                      | 158 +++++++++++++++++----
 apps/user_ldap/lib/access.php                      |   4 +-
 apps/user_ldap/lib/configuration.php               |  12 ++
 apps/user_ldap/lib/proxy.php                       |   7 +-
 apps/user_ldap/lib/wizard.php                      |  39 +++++
 .../templates/part.wizard-loginfilter.php          |  10 ++
 apps/user_ldap/templates/settings.php              |   3 -
 apps/user_ldap/user_ldap.php                       |  76 +++++++++-
 apps/user_ldap/user_proxy.php                      |  15 +-
 db_structure.xml                                   | 107 ++++++++++++++
 lib/private/appframework/app.php                   |   6 +-
 .../appframework/routing/routeactionhandler.php    |   2 +-
 lib/private/avatar.php                             |  10 +-
 lib/private/user.php                               |  16 +++
 lib/private/user/backend.php                       |  15 +-
 lib/private/user/user.php                          |  12 ++
 lib/public/appframework/app.php                    |  23 +++
 settings/personal.php                              |   1 +
 settings/templates/admin.php                       |  14 ++
 settings/templates/personal.php                    |   4 +
 tests/lib/user/avataruserdummy.php                 |  27 ++++
 tests/lib/user/user.php                            |  69 +++++++++
 33 files changed, 720 insertions(+), 156 deletions(-)


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