[Pkg-owncloud-commits] [owncloud] branch upstream updated (9da0817 -> a48c6bd)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a change to branch upstream
in repository owncloud.

      from  9da0817   Imported Upstream version 6.0.0~rc3+dfsg
       new  0af65ca   fix appearance of error message - .errors is outdated
       new  7eb505e   Fix user's displayName being overwritten by (old) cookie
       new  d0afd77   add method to check if users private/public key exists
       new  418d401   show change password form if key couldn't be decrypted
       new  f8a4bcd   only create new key on password change if a recovery key exists or if the user don't have any private/public keys
       new  91ca1cf   fix typo
       new  3e6b18b   Merge pull request #6208 from owncloud/enc_only_create_new_key_if_no_other_key_exists
       new  cc15770   it is not possible to unshare files
       new  c5d6af3   get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user
       new  f3e341e   add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
       new  01de6c5   set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
       new  87a2895   correctly propagate the return value of ldap_set_option otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn active directory paging will stop working (Operations error on ldap_control_paged_result_response)
       new  a2bbbb1   Users of getFolderContent are mostly interested in the unecrypted file size
       new  281bbf4   Don't try to encrypt a file when the temp file isn't created
       new  1475245   XSendfile and encryption don't work together
       new  7136517   reuse etags when doing a background scan
       new  cadf1c2   extend test case for etag preservation
       new  8369c1f   get rid of failing test that don't cause additional downloads
       new  3842c0d   Merge pull request #6225 from owncloud/stable6-backgroundscan-reuse-etag
       new  46a4ad4   Catch exceptions from background jobs and log them
       new  e78a309   remove background jobs if they are failing
       new  f309920   Dont use exceptions for the backgroundjob test cases
       new  3314494   add test case for removing background jobs that are throwing exceptions
       new  734fdbd   RC4
       new  a48c6bd   Imported Upstream version 6.0.0~rc4+dfsg

The 25 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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(-)
 delete mode 100644 apps/documents/css/viewer/webodf.css

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