[Pkg-owncloud-commits] [owncloud] 134/239: merge master into single-user-mode

[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 9fbccc83e3bdae664f7696da8d1902a516252830
Merge: a609a53 844b478
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon Nov 25 21:25:04 2013 +0100

    merge master into single-user-mode

 apps/files/js/filelist.js                         |  5 ++-
 apps/files_external/lib/dropbox.php               |  6 ++-
 apps/files_external/lib/swift.php                 |  4 +-
 apps/files_external/lib/webdav.php                |  1 +
 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 +-
 core/command/app/disable.php                      | 37 +++++++++++++++++
 core/command/app/enable.php                       | 39 ++++++++++++++++++
 core/command/app/listapps.php                     | 47 +++++++++++++++++++++
 core/css/styles.css                               |  2 +-
 core/register_command.php                         |  3 ++
 lib/base.php                                      | 27 +++++++++---
 lib/private/connector/sabre/filesplugin.php       | 12 ++++++
 lib/private/defaults.php                          | 50 ++++++++++++++++++++---
 lib/private/request.php                           | 13 +++++-
 lib/public/activity/iconsumer.php                 |  5 +++
 lib/public/activity/imanager.php                  |  6 ++-
 lib/public/appframework/app.php                   |  5 +++
 lib/public/appframework/controller.php            |  7 ++++
 lib/public/appframework/http.php                  |  8 +++-
 lib/public/appframework/http/jsonresponse.php     | 11 ++++-
 lib/public/appframework/http/response.php         |  4 ++
 lib/public/appframework/http/templateresponse.php | 26 +++++++++++-
 lib/public/appframework/iapi.php                  |  4 ++
 lib/public/appframework/middleware.php            |  4 ++
 lib/public/authentication/iapachebackend.php      |  5 +++
 lib/public/db.php                                 |  2 +
 lib/public/defaults.php                           | 28 ++++++++-----
 lib/public/files/alreadyexistsexception.php       |  8 ++++
 lib/public/files/entitytoolargeexception.php      |  8 ++++
 lib/public/files/file.php                         |  5 +++
 lib/public/files/folder.php                       |  5 +++
 lib/public/files/invalidcontentexception.php      |  8 ++++
 lib/public/files/invalidpathexception.php         |  8 ++++
 lib/public/files/node.php                         |  5 +++
 lib/public/files/notenoughspaceexception.php      |  8 ++++
 lib/public/files/notfoundexception.php            |  8 ++++
 lib/public/files/notpermittedexception.php        |  8 ++++
 lib/public/files/storage.php                      |  5 +++
 lib/public/iaddressbook.php                       |  5 +++
 lib/public/icontainer.php                         |  2 +-
 lib/public/idbconnection.php                      |  2 +-
 lib/public/share.php                              |  6 +--
 tests/lib/request.php                             | 42 +++++++++++++++++++
 46 files changed, 530 insertions(+), 62 deletions(-)

diff --cc core/register_command.php
index 2f351b6,144dcd3..1e520e3
--- a/core/register_command.php
+++ b/core/register_command.php
@@@ -10,4 -10,6 +10,7 @@@
  $application->add(new OC\Core\Command\Status);
  $application->add(new OC\Core\Command\Db\GenerateChangeScript());
  $application->add(new OC\Core\Command\Upgrade());
 +$application->add(new OC\Core\Command\Maintenance\SingleUser());
+ $application->add(new OC\Core\Command\App\Disable());
+ $application->add(new OC\Core\Command\App\Enable());
+ $application->add(new OC\Core\Command\App\ListApps());

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