[Pkg-owncloud-commits] [owncloud] 37/42: Merge tag 'upstream/6.0.1+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 96025844355f33c6fb083e55e501058787542e88
Merge: 7f14f03 db5ff38
Author: David Prévot <taffit at debian.org>
Date:   Wed Jan 22 08:56:05 2014 -0400

    Merge tag 'upstream/6.0.1+dfsg'
    
    Upstream version 6.0.1+dfsg
    
    # gpg: Signature faite le mer. 22 janv. 2014 08:46:59 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/files/ajax/upload.php                         |   1 +
 apps/files/js/filelist.js                          |   2 +
 apps/files/js/files.js                             |   5 ++-
 apps/files/triggerupdate.php                       |   1 +
 apps/files_encryption/appinfo/info.xml             |   2 +-
 apps/files_encryption/tests/crypt.php              |  34 ++++++++--------
 apps/files_encryption/tests/keymanager.php         |   4 +-
 apps/files_encryption/tests/proxy.php              |   2 +-
 apps/files_encryption/tests/stream.php             |   8 ++--
 apps/files_encryption/tests/trashbin.php           |   4 +-
 apps/files_encryption/tests/util.php               |   8 ++--
 apps/files_encryption/tests/webdav.php             |   2 +-
 apps/files_external/lib/webdav.php                 |   2 +-
 apps/files_sharing/ajax/publicpreview.php          |   3 +-
 apps/files_sharing/appinfo/update.php              |   1 +
 apps/files_sharing/css/public.css                  |  17 ++++----
 apps/files_sharing/js/public.js                    |   3 +-
 apps/files_sharing/public.php                      |   8 ++--
 apps/files_sharing/templates/public.php            |  26 ++++--------
 apps/files_trashbin/lib/trashbin.php               |   2 +-
 apps/files_versions/ajax/getVersions.php           |   3 +-
 apps/files_versions/ajax/preview.php               |  10 +----
 apps/files_versions/lib/versions.php               |  33 ++++++++-------
 apps/files_videoviewer/js/flashmediaelement.swf    | Bin 28644 -> 0 bytes
 .../js/silverlightmediaelement.xap                 | Bin 12461 -> 0 bytes
 apps/gallery/ajax/getimages.php                    |   1 +
 apps/gallery/ajax/image.php                        |   2 +
 apps/gallery/ajax/thumbnail.php                    |   2 +
 apps/gallery/public.php                            |   2 +-
 apps/user_ldap/lib/helper.php                      |  15 +++++--
 .../_sources/installation/installation_source.txt  |  19 +++++----
 .../admin/installation/installation_source.html    |  19 +++++----
 core/doc/user/_sources/files/versioncontrol.txt    |   4 +-
 core/doc/user/files/versioncontrol.html            |   3 +-
 core/skeleton/ownCloudUserManual.pdf               | Bin 1558533 -> 1558473 bytes
 lib/private/files.php                              |   2 +-
 lib/private/files/storage/home.php                 |  10 +++++
 lib/private/files/storage/wrapper/quota.php        |   2 +-
 lib/private/json.php                               |  14 +++++++
 lib/private/util.php                               |   4 ++
 lib/public/backgroundjob.php                       |   6 ++-
 lib/public/json.php                                |  10 ++++-
 lib/public/share.php                               |  45 +++++++++++++++++++--
 version.php                                        |   8 ++--
 44 files changed, 216 insertions(+), 133 deletions(-)

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