[Pkg-owncloud-commits] [owncloud] 199/273: Merge pull request #9341 from owncloud/sharing-fileactions-fix

[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 59629e688c3cc470279576524eac93041c253147
Merge: 5ec3771 025b71d
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jul 2 14:36:59 2014 +0200

    Merge pull request #9341 from owncloud/sharing-fileactions-fix
    
    Fix fileActionsReady event after deferred file actions update

 apps/files/js/fileactions.js             |  5 +-
 apps/files/js/filelist.js                | 34 +++++++-----
 apps/files/tests/js/filelistSpec.js      | 22 +++++++-
 apps/files_sharing/js/share.js           | 90 ++++++++++++++++++--------------
 apps/files_sharing/tests/js/shareSpec.js |  8 +++
 core/js/share.js                         | 11 +++-
 6 files changed, 115 insertions(+), 55 deletions(-)

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