[Pkg-owncloud-commits] [owncloud] 211/223: Merge pull request #9108 from owncloud/uploadintofolderfix

[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 d5819a5ecd26d4c7753f9c9fd0805ef83419cb0a
Merge: ca96b9d 8ae2468
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 20 19:01:05 2014 +0200

    Merge pull request #9108 from owncloud/uploadintofolderfix
    
    Fix many issues with drag and drop upload

 apps/files/ajax/upload.php          | 40 +++++++++++++------------
 apps/files/js/file-upload.js        |  2 +-
 apps/files/js/filelist.js           | 58 ++++++++++++++++++++++---------------
 apps/files/tests/js/filelistSpec.js | 26 ++---------------
 apps/files_sharing/js/public.js     |  2 +-
 5 files changed, 59 insertions(+), 69 deletions(-)

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