[Pkg-owncloud-commits] [owncloud] 133/239: Merge pull request #6034 from owncloud/fix-api-documentation

[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 844b4785f1e992391d51ef34eacc5cfda107ee50
Merge: 4626fae b3e7e54
Author: Owen Winkler <a_github at midnightcircus.com>
Date:   Mon Nov 25 11:17:16 2013 -0800

    Merge pull request #6034 from owncloud/fix-api-documentation
    
    Fix api documentation

 lib/private/defaults.php                          | 50 ++++++++++++++++++++---
 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 +--
 29 files changed, 231 insertions(+), 25 deletions(-)


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