[Pkg-owncloud-commits] [owncloud] 152/172: Merge pull request #6260 from owncloud/jan-navigation-filesidebar

[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 1fb0d5412c7a4a3b888098e492342699d05fe55e
Merge: 43d6650 6fd0842
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri May 16 13:00:35 2014 +0200

    Merge pull request #6260 from owncloud/jan-navigation-filesidebar
    
    Files app navigation sidebar

 .jshintrc                                       |    1 +
 apps/files/appinfo/app.php                      |   10 +
 apps/files/css/files.css                        |   53 +-
 apps/files/index.php                            |   89 +-
 apps/files/js/app.js                            |  147 ++
 apps/files/js/breadcrumb.js                     |   12 +-
 apps/files/js/file-upload.js                    |   15 +-
 apps/files/js/fileactions.js                    |  435 ++--
 apps/files/js/filelist.js                       | 3123 ++++++++++++-----------
 apps/files/js/files.js                          |  632 +++--
 apps/files/js/filesummary.js                    |    2 +-
 apps/files/js/keyboardshortcuts.js              |    3 +-
 apps/files/js/navigation.js                     |  122 +
 apps/files/lib/app.php                          |   17 +
 apps/files/list.php                             |   38 +
 apps/files/templates/appnavigation.php          |   17 +
 apps/files/templates/index.php                  |  121 +-
 apps/files/templates/{index.php => list.php}    |   43 +-
 apps/files/tests/js/appSpec.js                  |  220 ++
 apps/files/tests/js/breadcrumbSpec.js           |    4 +-
 apps/files/tests/js/fileactionsSpec.js          |   38 +-
 apps/files/tests/js/filelistSpec.js             |  701 ++---
 apps/files/tests/js/filesSpec.js                |   17 +-
 apps/files/tests/js/filesummarySpec.js          |    3 +-
 apps/files_sharing/css/public.css               |    4 -
 apps/files_sharing/js/public.js                 |  213 +-
 apps/files_sharing/js/share.js                  |   18 +-
 apps/files_sharing/public.php                   |    5 +-
 apps/files_trashbin/appinfo/app.php             |   14 +-
 apps/files_trashbin/css/trash.css               |   13 +-
 apps/files_trashbin/index.php                   |   42 -
 apps/files_trashbin/js/app.js                   |   82 +
 apps/files_trashbin/js/disableDefaultActions.js |    3 -
 apps/files_trashbin/js/filelist.js              |  373 +--
 apps/files_trashbin/js/trash.js                 |  130 -
 apps/files_trashbin/list.php                    |   11 +
 apps/files_trashbin/templates/index.php         |    8 +-
 apps/files_trashbin/tests/js/appSpec.js         |   69 +
 apps/files_trashbin/tests/js/filelistSpec.js    |  309 +++
 core/css/apps.css                               |    3 +
 core/js/js.js                                   |  113 +
 core/templates/layout.user.php                  |    2 +-
 lib/private/template.php                        |    4 +-
 lib/private/templatelayout.php                  |    4 +-
 settings/templates/personal.php                 |    6 -
 tests/karma.config.js                           |    2 +-
 46 files changed, 4229 insertions(+), 3062 deletions(-)

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