[Pkg-owncloud-commits] [owncloud] 29/83: Merge branch 'stable5' into fixing-4866-stable5

[David Prévot]

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

taffit pushed a commit to branch 5.0
in repository owncloud.

commit 1267dccfe36bb274df6d3fe54f19fa67a3223427
Merge: e01efd3 6eae96b
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Nov 22 15:44:59 2013 +0100

    Merge branch 'stable5' into fixing-4866-stable5

 apps/files/ajax/list.php                   |   1 +
 apps/files/ajax/upload.php                 |   7 +-
 apps/files/css/files.css                   |   3 +
 apps/files/index.php                       |   3 +-
 apps/files/js/file-upload.js               |   2 +
 apps/files/js/fileactions.js               |  12 +-
 apps/files/js/filelist.js                  |  35 +-
 apps/files/js/files.js                     |   7 +-
 apps/files_encryption/appinfo/info.xml     |   1 +
 apps/files_encryption/hooks/hooks.php      |  70 +++-
 apps/files_encryption/lib/keymanager.php   |   7 +-
 apps/files_encryption/lib/proxy.php        |  56 ++-
 apps/files_encryption/lib/stream.php       |   3 +-
 apps/files_encryption/lib/util.php         |  11 +-
 apps/files_encryption/settings-admin.php   |   4 +-
 apps/files_encryption/tests/util.php       |  28 ++
 apps/files_external/lib/smb.php            |  19 +-
 apps/files_external/lib/streamwrapper.php  |  36 +-
 apps/files_external/tests/smbfunctions.php |  41 ++
 apps/files_sharing/appinfo/app.php         |   1 +
 apps/files_sharing/appinfo/routes.php      |  27 ++
 apps/files_sharing/appinfo/update.php      |  22 +-
 apps/files_sharing/appinfo/version         |   2 +-
 apps/files_sharing/js/share.js             |  18 +-
 apps/files_sharing/lib/api.php             | 531 +++++++++++++++++++++++++
 apps/files_sharing/lib/cache.php           |  97 ++++-
 apps/files_sharing/lib/updater.php         |  30 +-
 apps/files_sharing/templates/public.php    |   1 +
 apps/files_sharing/tests/api.php           | 597 +++++++++++++++++++++++++++++
 apps/files_versions/js/versions.js         |   8 +
 apps/user_ldap/lib/access.php              |  21 +-
 config/config.sample.php                   |   5 +-
 core/ajax/share.php                        |   2 +-
 core/js/js.js                              |  22 ++
 core/js/multiselect.js                     |   6 +-
 core/js/share.js                           | 107 ++++--
 core/templates/login.php                   |   2 +
 lib/appconfig.php                          |  20 +-
 lib/base.php                               |   2 +
 lib/cache/file.php                         |  18 +
 lib/connector/sabre/directory.php          |  61 ++-
 lib/connector/sabre/file.php               |  16 +-
 lib/connector/sabre/node.php               |  11 +
 lib/db.php                                 | 124 +++++-
 lib/filechunking.php                       |  33 +-
 lib/files/cache/cache.php                  | 232 +++++++----
 lib/files/cache/updater.php                |  50 ++-
 lib/files/filesystem.php                   |  26 +-
 lib/files/storage/home.php                 |  31 ++
 lib/files/view.php                         |  15 +-
 lib/helper.php                             |  24 +-
 lib/installer.php                          |   6 +-
 lib/log.php                                |   2 +
 lib/log/owncloud.php                       |  24 +-
 lib/public/share.php                       |  27 +-
 lib/search/provider/file.php               |   3 +-
 lib/search/result.php                      |   3 +-
 lib/setup.php                              |   8 +-
 lib/updater.php                            |   3 +-
 lib/user.php                               |  21 +-
 lib/user/database.php                      |   2 +-
 lib/util.php                               |  56 ++-
 search/js/result.js                        |  55 ++-
 tests/enable_all.php                       |   1 +
 tests/lib/files/cache/updater.php          |  17 +
 tests/lib/files/filesystem.php             |  57 ++-
 tests/lib/files/storage/storage.php        |  57 ++-
 tests/lib/files/view.php                   |  70 +++-
 tests/lib/helper.php                       |  34 ++
 tests/lib/share/share.php                  |  48 +++
 70 files changed, 2648 insertions(+), 354 deletions(-)


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