[Pkg-owncloud-commits] [owncloud] 90/273: Merge pull request #9254 from owncloud/fileactions-deferred

[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 3b2fd5e4e6aad769f656c473f1a1fe53f5936c47
Merge: b975f0e 586b3a9
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 27 15:03:21 2014 +0200

    Merge pull request #9254 from owncloud/fileactions-deferred
    
    Sync file list with file actions

 apps/files/js/app.js                               |  4 ++
 apps/files/js/fileactions.js                       | 55 ++++++++++++++++++++--
 apps/files/js/filelist.js                          | 22 +++++++++
 apps/files/tests/js/fileactionsSpec.js             | 53 ++++++++++++++++++++-
 apps/files/tests/js/filelistSpec.js                | 32 +++++++++++++
 apps/files_external/tests/appSpec.js               |  1 +
 apps/files_external/tests/js/mountsfilelistSpec.js |  1 +
 apps/files_sharing/tests/js/appSpec.js             |  2 +
 apps/files_sharing/tests/js/shareSpec.js           |  2 +
 apps/files_sharing/tests/js/sharedfilelistSpec.js  |  1 +
 apps/files_trashbin/tests/js/filelistSpec.js       |  1 +
 11 files changed, 168 insertions(+), 6 deletions(-)


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