[Pkg-owncloud-commits] [owncloud] 108/153: Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible

[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 14a953fbe01a3d26e1330ea224ab71928a2f93c1
Merge: c586d1f 5f403f3
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Wed May 21 14:07:49 2014 -0400

    Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
    
    [sharing] move the mount point up if the parent folder no longer exists

 apps/files_sharing/appinfo/app.php         |   3 +
 apps/files_sharing/lib/helper.php          |  22 +++++
 apps/files_sharing/lib/proxy.php           |  69 ++++++++++++++++
 apps/files_sharing/lib/share/file.php      |  11 +--
 apps/files_sharing/lib/sharedstorage.php   | 113 +++++++++++++++----------
 apps/files_sharing/lib/updater.php         |   9 +-
 apps/files_sharing/tests/proxy.php         |  98 ++++++++++++++++++++++
 apps/files_sharing/tests/sharedstorage.php |  46 +++++++++++
 apps/files_sharing/tests/updater.php       | 128 ++++++++++++++++++++++++-----
 lib/private/files/mount/mount.php          |  11 +++
 10 files changed, 432 insertions(+), 78 deletions(-)

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