[Pkg-owncloud-commits] [owncloud] 109/239: Merge pull request #5641 from owncloud/filestrash-emptytrash

[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 31d0ba03449bd0f6b8f245e456e8ba83b99413cf
Merge: 2d2af90 80c8666
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Mon Nov 25 05:24:11 2013 -0800

    Merge pull request #5641 from owncloud/filestrash-emptytrash
    
    Deleting all files in trash now only sends a single flag

 apps/files/js/filelist.js               |  5 ++--
 apps/files_trashbin/ajax/delete.php     | 39 +++++++++++++++++++--------
 apps/files_trashbin/js/filelist.js      |  7 +++++
 apps/files_trashbin/js/trash.js         | 48 ++++++++++++++++++++++++++-------
 apps/files_trashbin/templates/index.php |  4 +--
 5 files changed, 77 insertions(+), 26 deletions(-)


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