[Pkg-owncloud-commits] [owncloud] 81/85: Merge tag 'upstream/6.0.4_beta1+dfsg' into 6.0
David Prévot
taffit at moszumanska.debian.org
Tue Jun 17 19:12:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch 6.0
in repository owncloud.
commit 7ff5481726406f714c17a5c62a63355e756ef45e
Merge: af2f73a 1d7c24b
Author: David Prévot <taffit at debian.org>
Date: Tue Jun 17 11:40:02 2014 -0400
Merge tag 'upstream/6.0.4_beta1+dfsg' into 6.0
Upstream version 6.0.4~beta1+dfsg
# gpg: Signature faite le mar. 17 juin 2014 11:39:45 AST
# gpg: avec la clef RSA B82A217AFDFE09F2
# 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
apps/bookmarks/js/bookmarks.js | 6 +-
apps/calendar/l10n/nl/calendar.po | 2 +-
apps/calendar/lib/object.php | 4 +-
apps/calendar/lib/sabre/backend.php | 5 +-
apps/calendar/templates/settings.php | 2 +-
.../icons/images/commonIconsObjActEnabled.png | Bin 12474 -> 0 bytes
.../dijit/icons/images/editorIconsDisabled_rtl.png | Bin 6965 -> 0 bytes
.../dijit/icons/images/editorIconsEnabled_rtl.png | Bin 7144 -> 0 bytes
.../themes/claro/images/checkmarkNoBorder.png | Bin 4401 -> 0 bytes
.../dijit/themes/tundra/images/checkmark.png | Bin 5529 -> 0 bytes
.../themes/tundra/images/checkmarkNoBorder.png | Bin 4401 -> 0 bytes
.../dijit/themes/tundra/images/circleIcon.png | Bin 2975 -> 0 bytes
.../themes/tundra/images/tooltipConnectorLeft.png | Bin 3106 -> 0 bytes
.../themes/tundra/images/tooltipConnectorRight.png | Bin 3121 -> 0 bytes
.../themes/tundra/images/tooltipConnectorUp.png | Bin 3092 -> 0 bytes
.../layout/resources/icons/splitterToggleH.png | Bin 2937 -> 0 bytes
.../layout/resources/icons/splitterToggleV.png | Bin 2938 -> 0 bytes
apps/documents/js/documents.js | 6 +-
apps/documents/js/viewer/viewer.js | 3 +
apps/files/ajax/upload.php | 4 +-
apps/files/js/fileactions.js | 11 +-
apps/files/templates/fileexists.html | 4 +-
apps/files_encryption/hooks/hooks.php | 20 +-
apps/files_encryption/lib/keymanager.php | 4 +-
apps/files_encryption/lib/proxy.php | 9 +-
apps/files_encryption/lib/stream.php | 2 +-
apps/files_encryption/lib/util.php | 17 +-
apps/files_encryption/tests/hooks.php | 55 ++-
apps/files_encryption/tests/stream.php | 6 +
apps/files_encryption/tests/webdav.php | 9 +-
apps/files_external/appinfo/app.php | 3 +-
apps/files_external/lib/config.php | 223 ++++++++++-
apps/files_external/lib/smb.php | 2 +-
apps/files_external/tests/mountconfig.php | 414 ++++++++++++++++++++-
apps/files_sharing/css/public.css | 14 +
apps/files_sharing/js/public.js | 8 +-
apps/files_sharing/lib/share/file.php | 10 +-
apps/files_sharing/tests/api.php | 57 ++-
apps/gallery/lib/thumbnail.php | 5 +-
apps/updater/ajax/update.php | 6 +-
apps/updater/templates/update.php | 4 +-
apps/user_ldap/appinfo/update.php | 42 ++-
apps/user_ldap/appinfo/version | 2 +-
apps/user_ldap/lib/wizard.php | 4 +-
apps/user_ldap/tests/wizard.php | 80 +++-
config/config.sample.php | 3 +
core/css/multiselect.css | 2 +-
core/doc/admin/_images/install-wizard-advanced.png | Bin 0 -> 107639 bytes
core/doc/admin/_images/install-wizard.png | Bin 0 -> 86115 bytes
.../admin/_sources/apps/files_external/index.txt | 3 +
core/doc/admin/_sources/config/code_locations.txt | 2 +-
.../_sources/configuration/configuration_apps.txt | 3 +-
.../configuration/configuration_database.txt | 104 ++++--
.../_sources/configuration/configuration_users.txt | 3 +-
.../configuration/configuring_big_file_upload.txt | 27 +-
core/doc/admin/_sources/installation/index.txt | 3 +-
.../_sources/installation/installation_linux.txt | 8 +-
.../_sources/installation/installation_source.txt | 128 ++-----
.../_sources/installation/installation_windows.txt | 21 +-
.../_sources/installation/installation_wizard.txt | 119 ++++++
core/doc/admin/_sources/issues/index.txt | 2 +-
core/doc/admin/_sources/maintenance/update.txt | 2 +-
core/doc/admin/_static/comment-bright.png | Bin 3500 -> 0 bytes
core/doc/admin/_static/comment-close.png | Bin 3578 -> 0 bytes
core/doc/admin/_static/comment.png | Bin 3445 -> 0 bytes
core/doc/admin/apps/files_external/index.html | 5 +
core/doc/admin/config/code_locations.html | 2 +-
.../admin/configuration/configuration_apps.html | 2 +-
.../configuration/configuration_database.html | 93 +++--
.../admin/configuration/configuration_users.html | 2 +-
.../configuration/configuring_big_file_upload.html | 25 +-
core/doc/admin/configuration/index.html | 2 +-
core/doc/admin/contents.html | 10 +-
core/doc/admin/installation/index.html | 2 +
.../admin/installation/installation_appliance.html | 1 +
.../doc/admin/installation/installation_linux.html | 8 +-
.../doc/admin/installation/installation_macos.html | 1 +
.../admin/installation/installation_others.html | 3 +-
.../admin/installation/installation_source.html | 114 ++----
core/doc/admin/installation/installation_ucs.html | 1 +
.../admin/installation/installation_windows.html | 24 +-
.../admin/installation/installation_wizard.html | 274 ++++++++++++++
core/doc/admin/issues/index.html | 2 +-
core/doc/admin/maintenance/update.html | 2 +-
core/doc/user/_images/oc_ui.png | Bin 138786 -> 0 bytes
core/doc/user/_images/osx_webdav1.png | Bin 245992 -> 0 bytes
core/doc/user/_sources/bookmarks.txt | 6 +-
core/doc/user/_sources/files/filesweb.txt | 12 +-
core/doc/user/_sources/files/versioncontrol.txt | 1 +
core/doc/user/_sources/pim/contacts.txt | 7 +
core/doc/user/_sources/pim/sync_thunderbird.txt | 7 +-
core/doc/user/_static/comment-bright.png | Bin 3500 -> 0 bytes
core/doc/user/_static/comment-close.png | Bin 3578 -> 0 bytes
core/doc/user/_static/comment.png | Bin 3445 -> 0 bytes
core/doc/user/bookmarks.html | 4 +-
core/doc/user/files/filesweb.html | 8 +-
core/doc/user/files/versioncontrol.html | 1 +
core/doc/user/pim/sync_thunderbird.html | 3 +-
core/js/js.js | 5 +
core/js/oc-dialogs.js | 9 +-
core/skeleton/ownCloudUserManual.pdf | Bin 1572005 -> 0 bytes
core/skeleton/photos/paris.jpg | Bin 228761 -> 0 bytes
core/skeleton/photos/san francisco.jpg | Bin 216071 -> 0 bytes
core/skeleton/photos/squirrel.jpg | Bin 233724 -> 0 bytes
lib/base.php | 34 +-
.../connector/sabre/exception/filelocked.php | 28 ++
lib/private/connector/sabre/file.php | 21 +-
lib/private/files.php | 12 +-
lib/private/files/cache/cache.php | 4 +
lib/private/files/cache/changepropagator.php | 98 +++++
lib/private/files/cache/scanner.php | 180 +++++----
lib/private/files/filesystem.php | 73 +---
lib/private/files/mount/mount.php | 2 +-
lib/private/files/storage/common.php | 20 +-
lib/private/files/storage/loader.php | 4 +-
lib/private/files/storage/local.php | 14 +-
lib/private/files/storage/wrapper/wrapper.php | 29 ++
lib/private/files/utils/scanner.php | 21 +-
lib/private/files/view.php | 6 +-
lib/private/helper.php | 41 +-
lib/private/log/owncloud.php | 17 +-
lib/private/ocs/result.php | 2 +-
lib/private/preview.php | 7 +-
lib/private/server.php | 12 +-
lib/private/util.php | 42 ++-
lib/public/files/locknotacquiredexception.php | 47 +++
lib/public/files/storage.php | 19 +
lib/public/share.php | 6 +-
lib/public/util.php | 9 +
version.php | 8 +-
130 files changed, 2240 insertions(+), 625 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list