[Pkg-owncloud-commits] [owncloud] 31/134: Merge pull request #7586 from owncloud/dont_create_shared_folder_stable6

[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 acc35849af37e4c2951d8bcca8aaac1826a7eeb7
Merge: c9c91c7 7f81b14
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Fri Mar 7 10:31:08 2014 +0100

    Merge pull request #7586 from owncloud/dont_create_shared_folder_stable6
    
    [oc6] don't allow to create a file or folder named 'Shared' in the root folder

 apps/files/ajax/move.php                   |  2 +-
 apps/files/js/file-upload.js               | 34 +++++++++++++++---------------
 apps/files/js/filelist.js                  |  9 +++-----
 apps/files/js/files.js                     | 19 +++++++++++++----
 lib/private/connector/sabre/directory.php  |  4 ++--
 lib/private/connector/sabre/objecttree.php |  3 +++
 6 files changed, 41 insertions(+), 30 deletions(-)

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