[Pkg-owncloud-commits] [owncloud] 188/223: Merge pull request #8399 from owncloud/server-server-sharing

[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 8d1cf79152b16b11e8be3bc6cc57f5a9e72b04dd
Merge: cce5836 07fdeba
Author: icewind1991 <robin at icewind.nl>
Date:   Tue Jun 17 17:40:05 2014 +0200

    Merge pull request #8399 from owncloud/server-server-sharing
    
    Add server<->server sharing

 apps/files/appinfo/remote.php                   |   3 +-
 apps/files_encryption/lib/proxy.php             |  41 ++++++-
 apps/files_encryption/lib/session.php           |   2 +
 apps/files_encryption/tests/webdav.php          |   3 +-
 apps/files_external/lib/webdav.php              |  41 +++++--
 apps/files_sharing/ajax/external.php            |  51 +++++++++
 apps/files_sharing/ajax/shareinfo.php           |  69 ++++++++++++
 apps/files_sharing/ajax/testremote.php          |  29 +++++
 apps/files_sharing/appinfo/app.php              |  14 +++
 apps/files_sharing/appinfo/database.xml         |  95 ++++++++++++++++
 apps/files_sharing/appinfo/routes.php           |   4 +
 apps/files_sharing/appinfo/version              |   2 +-
 apps/files_sharing/css/public.css               |  35 ++++++
 apps/files_sharing/js/external.js               |  71 ++++++++++++
 apps/files_sharing/js/public.js                 |  69 +++++++++---
 apps/files_sharing/js/settings-admin.js         |  11 ++
 apps/files_sharing/lib/connector/publicauth.php |   1 +
 apps/files_sharing/lib/external/cache.php       |  47 ++++++++
 apps/files_sharing/lib/external/manager.php     | 140 ++++++++++++++++++++++++
 apps/files_sharing/lib/external/mount.php       |  53 +++++++++
 apps/files_sharing/lib/external/scanner.php     |  54 +++++++++
 apps/files_sharing/lib/external/storage.php     | 103 +++++++++++++++++
 apps/files_sharing/lib/helper.php               |  22 +++-
 apps/files_sharing/lib/isharedstorage.php       |  13 +++
 apps/files_sharing/lib/readonlycache.php        |  27 +++++
 apps/files_sharing/lib/readonlywrapper.php      |  56 ++++++++++
 apps/files_sharing/lib/sharedstorage.php        |  24 ++--
 apps/files_sharing/public.php                   |   1 +
 apps/files_sharing/publicwebdav.php             |  21 +++-
 apps/files_sharing/settings-admin.php           |  17 +++
 apps/files_sharing/templates/public.php         |  17 ++-
 apps/files_sharing/templates/settings-admin.php |  13 +++
 config/.htaccess                                |   0
 lib/private/connector/sabre/directory.php       |   3 +-
 lib/private/connector/sabre/file.php            |   2 +-
 lib/private/connector/sabre/objecttree.php      |  23 ++--
 lib/private/files/cache/cache.php               |  10 +-
 lib/private/files/storage/common.php            |  28 +++--
 lib/private/files/storage/home.php              |   7 +-
 lib/private/files/storage/storage.php           |   9 +-
 lib/private/files/storage/wrapper/wrapper.php   |  26 ++++-
 lib/private/files/view.php                      |  60 ++++++----
 lib/private/helper.php                          |   2 +-
 lib/private/share/share.php                     |   6 +-
 tests/lib/connector/sabre/objecttree.php        |   3 +-
 45 files changed, 1222 insertions(+), 106 deletions(-)

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