[Pkg-owncloud-commits] [owncloud] 168/199: Merge pull request #8417 from owncloud/share-overview

[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 517501ffbf369b24191d8b9a9f2ce44a9891fb97
Merge: 929882a 7fac2b6
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Fri May 30 13:42:24 2014 +0200

    Merge pull request #8417 from owncloud/share-overview
    
    Sharing overview page

 apps/files/css/files.css                          |   8 +-
 apps/files/index.php                              |   5 +
 apps/files/js/app.js                              |  35 +-
 apps/files/js/fileactions.js                      | 101 ++++--
 apps/files/js/filelist.js                         |  60 ++--
 apps/files/tests/js/appSpec.js                    |  53 ++-
 apps/files/tests/js/fileactionsSpec.js            |  80 ++++-
 apps/files/tests/js/filelistSpec.js               |  47 ++-
 apps/files_sharing/appinfo/app.php                |  20 ++
 apps/files_sharing/css/sharedfilelist.css         |   3 +
 apps/files_sharing/js/app.js                      | 106 ++++++
 apps/files_sharing/js/public.js                   |  23 +-
 apps/files_sharing/js/share.js                    |  50 +--
 apps/files_sharing/js/sharedfilelist.js           | 235 ++++++++++++
 apps/files_sharing/lib/api.php                    |  38 +-
 apps/files_sharing/list.php                       |  11 +
 apps/files_sharing/templates/list.php             |  28 ++
 apps/files_sharing/tests/js/appSpec.js            | 143 ++++++++
 apps/files_sharing/tests/js/sharedfilelistSpec.js | 412 ++++++++++++++++++++++
 apps/files_trashbin/appinfo/app.php               |   2 +-
 apps/files_trashbin/js/app.js                     |  24 +-
 apps/files_trashbin/js/filelist.js                |   4 +-
 apps/files_trashbin/tests/js/filelistSpec.js      |  11 +-
 apps/files_versions/js/versions.js                |  37 +-
 core/js/js.js                                     |  13 +-
 core/js/share.js                                  |  64 ++--
 tests/karma.config.js                             |  43 ++-
 27 files changed, 1494 insertions(+), 162 deletions(-)

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