[Pkg-owncloud-commits] [owncloud] 12/15: Merge tag 'upstream/7.0.3+dfsg'

[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 69735c2bfba4ae2187904165f1cbf98db405927d
Merge: 7474127 37c1f12
Author: David Prévot <taffit at debian.org>
Date:   Tue Nov 11 10:02:05 2014 -0400

    Merge tag 'upstream/7.0.3+dfsg'
    
    Upstream version 7.0.3+dfsg
    
    # gpg: Signature faite le mar. 11 nov. 2014 10:01:49 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 apps/activity/lib/display.php                      |   7 +-
 apps/activity/lib/parameterhelper.php              |  11 +-
 apps/activity/tests/datahelpertest.php             |  16 +-
 apps/activity/tests/parameterhelpertest.php        |  12 +-
 apps/documents/ajax/admin.php                      |   6 +-
 apps/documents/appinfo/app.php                     |  10 +-
 apps/documents/js/admin.js                         |   6 +-
 apps/documents/lib/config.php                      |   2 +-
 apps/documents/templates/admin.php                 |  14 +-
 apps/files/tests/js/filelistSpec.js                |  14 +-
 core/doc/user/_sources/contents.txt                |  12 +-
 core/doc/user/_sources/index.txt                   |  33 ++--
 core/doc/user/_sources/migration.txt               |  19 ---
 core/doc/user/bookmarks.html                       |   3 +-
 core/doc/user/contents.html                        |  18 +--
 core/doc/user/documents.html                       |   1 -
 core/doc/user/external_storage/google_drive.html   |   1 -
 .../user/files/configuring_big_file_upload.html    |   1 -
 core/doc/user/files/deletedfiles.html              |   1 -
 core/doc/user/files/encryption.html                |   1 -
 core/doc/user/files/files.html                     |   1 -
 core/doc/user/files/filesweb.html                  |   1 -
 core/doc/user/files/index.html                     |   1 -
 core/doc/user/files/quota.html                     |   1 -
 core/doc/user/files/server_to_server_using.html    |   1 -
 core/doc/user/files/sync.html                      |   1 -
 core/doc/user/files/versioncontrol.html            |   1 -
 core/doc/user/genindex.html                        |   1 -
 core/doc/user/index.html                           |  40 ++---
 core/doc/user/installing_apps.html                 |   1 -
 core/doc/user/migration.html                       | 174 ---------------------
 core/doc/user/objects.inv                          | Bin 293 -> 296 bytes
 core/doc/user/pim/calendar.html                    |   1 -
 core/doc/user/pim/contacts.html                    |   1 -
 core/doc/user/pim/index.html                       |   1 -
 core/doc/user/pim/sync_ios.html                    |   1 -
 core/doc/user/pim/sync_kde.html                    |   1 -
 core/doc/user/pim/sync_osx.html                    |   1 -
 core/doc/user/pim/sync_thunderbird.html            |   1 -
 core/doc/user/pim/troubleshooting.html             |   1 -
 core/doc/user/search.html                          |   1 -
 core/doc/user/userpreferences.html                 |   3 +-
 core/doc/user/webinterface.html                    |   1 -
 core/doc/user/whats_new.html                       |   1 -
 core/setup/controller.php                          |   2 +-
 lib/private/connector/sabre/directory.php          |  68 ++++----
 lib/private/connector/sabre/file.php               | 138 +++++++++-------
 lib/private/connector/sabre/objecttree.php         |  58 ++++---
 lib/private/connector/sabre/quotaplugin.php        |   8 +-
 lib/private/db.php                                 |   5 +-
 lib/private/user.php                               |   3 +
 settings/templates/users/part.createuser.php       |   2 +-
 version.php                                        |   8 +-
 53 files changed, 257 insertions(+), 460 deletions(-)

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