[Pkg-owncloud-commits] [owncloud] 199/223: Merge pull request #9068 from owncloud/trashbin_unittests_master

[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 edbc6b5db12fe16b6ea7dfb10d116aa9da4e2244
Merge: a921ad8 bcc88be
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Wed Jun 18 15:32:16 2014 +0200

    Merge pull request #9068 from owncloud/trashbin_unittests_master
    
    fix trash bin expire operation and add unit tests

 apps/files_encryption/tests/trashbin.php |   2 +-
 apps/files_trashbin/ajax/delete.php      |   2 +-
 apps/files_trashbin/ajax/list.php        |   2 +-
 apps/files_trashbin/ajax/undelete.php    |   2 +-
 apps/files_trashbin/lib/helper.php       |   4 +-
 apps/files_trashbin/lib/trashbin.php     |  94 ++++++---
 apps/files_trashbin/tests/trashbin.php   | 321 +++++++++++++++++++++++++++++++
 tests/enable_all.php                     |   1 +
 8 files changed, 392 insertions(+), 36 deletions(-)

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