[Pkg-owncloud-commits] [owncloud] 26/28: Merge tag 'upstream/6.0.0_rc4+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 a4ed20c37a89002298345104a837aec0ac922c94
Merge: 8041476 a48c6bd
Author: David Prévot <taffit at debian.org>
Date:   Fri Dec 6 21:53:16 2013 -0400

    Merge tag 'upstream/6.0.0_rc4+dfsg'
    
    Upstream version 6.0.0~rc4+dfsg
    
    # gpg: Signature faite le ven. 06 déc. 2013 21:53:10 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/documents/ajax/otpoll.php                     |    1 +
 apps/documents/ajax/sessionController.php          |   18 +
 apps/documents/appinfo/routes.php                  |    4 +
 apps/documents/css/style.css                       |   19 +-
 apps/documents/css/viewer/webodf.css               |  320 -----
 .../js/3rdparty/webodf/editor/MemberListView.js    |    4 +-
 apps/documents/js/3rdparty/webodf/webodf-debug.js  |  727 +++++------
 apps/documents/js/3rdparty/webodf/webodf.js        | 1270 ++++++++++----------
 apps/documents/js/documents.js                     |  109 +-
 apps/documents/js/viewer/viewer.js                 |    2 +-
 apps/documents/lib/db/op.php                       |   30 +-
 apps/documents/lib/file.php                        |   18 +-
 .../src/patches/MemberListView-OCavatar.patch      |   20 +-
 apps/documents/src/updateWebODF.sh                 |    3 +-
 apps/documents/templates/documents.php             |    2 +-
 apps/files/templates/index.php                     |   19 +-
 apps/files_encryption/hooks/hooks.php              |   51 +-
 apps/files_encryption/lib/util.php                 |   58 +-
 .../templates/settings-personal.php                |    2 +-
 apps/files_sharing/lib/updater.php                 |    8 +-
 apps/files_texteditor/css/style.css                |    1 +
 apps/gallery/js/slideshow.js                       |   10 +-
 apps/user_ldap/lib/ldap.php                        |    2 +-
 core/doc/user/_sources/files/encryption.txt        |   12 +-
 core/doc/user/files/encryption.html                |   12 +-
 core/skeleton/ownCloudUserManual.pdf               |  Bin 1393379 -> 1393288 bytes
 core/templates/installation.php                    |   11 +-
 cron.php                                           |    6 +-
 lib/base.php                                       |    1 -
 lib/private/backgroundjob/job.php                  |   23 +-
 lib/private/backgroundjob/queuedjob.php            |    5 +-
 lib/private/backgroundjob/timedjob.php             |    6 +-
 lib/private/files.php                              |    3 +
 lib/private/files/cache/cache.php                  |    4 +
 lib/private/files/cache/scanner.php                |    2 +-
 lib/public/share.php                               |   35 +-
 version.php                                        |    6 +-
 37 files changed, 1369 insertions(+), 1455 deletions(-)

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