[Pkg-owncloud-commits] [owncloud] 26/111: Merge branch 'master' into oc_api_tests

[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 00944a376a83695256f91f800bece1d2de10b89e
Merge: 959513f 8d0d083
Author: tomneedham <tom at owncloud.com>
Date:   Thu Nov 14 00:40:57 2013 +0000

    Merge branch 'master' into oc_api_tests

 apps/files/js/filelist.js                       |    6 +-
 apps/files_encryption/lib/helper.php            |   43 +++++++++
 apps/files_encryption/lib/keymanager.php        |   54 ++----------
 apps/files_encryption/lib/proxy.php             |    6 +-
 apps/files_encryption/lib/util.php              |    5 +-
 apps/files_encryption/tests/helper.php          |   54 ++++++++++++
 apps/files_encryption/tests/keymanager.php      |   17 ----
 apps/files_external/css/settings.css            |    4 +
 apps/files_sharing/lib/sharedstorage.php        |  106 ++++++++++-------------
 apps/user_ldap/css/settings.css                 |    8 +-
 apps/user_ldap/js/settings.js                   |   27 +++---
 apps/user_ldap/lib/wizard.php                   |   46 ++++------
 apps/user_ldap/templates/part.wizard-server.php |    4 +-
 apps/user_ldap/templates/settings.php           |    3 +-
 lib/private/connector/sabre/file.php            |   28 +++++-
 lib/private/files/cache/homecache.php           |   40 +++++++++
 lib/private/files/filesystem.php                |   14 ++-
 lib/private/files/storage/common.php            |   10 +--
 lib/private/files/storage/home.php              |   21 ++++-
 settings/css/settings.css                       |    5 ++
 tests/lib/files/cache/cache.php                 |   55 +++++++++---
 tests/lib/files/cache/homecache.php             |   95 ++++++++++++++++++++
 tests/lib/files/filesystem.php                  |   64 ++++++++++++++
 tests/lib/files/storage/home.php                |   29 ++++++-
 version.php                                     |    4 +-
 25 files changed, 531 insertions(+), 217 deletions(-)

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