[Pkg-owncloud-commits] [owncloud] 74/78: Merge tag 'upstream/7.0.6_rc1_dfsg'
David Prévot
taffit at moszumanska.debian.org
Sun May 31 01:59:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 12c61b29b13f7227b192b35917531f1341811edc
Merge: 64349c5 04fd509
Author: David Prévot <taffit at debian.org>
Date: Sat May 30 17:34:24 2015 -0400
Merge tag 'upstream/7.0.6_rc1_dfsg'
Upstream version 7.0.6~rc1~dfsg
# gpg: Signature made sam. 30 mai 2015 17:34:10 AST
# gpg: using RSA key 058C1CF944F6BD3C
# gpg: Good signature from "David Prévot <david at tilapin.org>"
# gpg: aka "David Prévot <davidp at altern.org>"
# gpg: aka "David Prévot <davidp at no-log.org>"
# gpg: aka "David Prévot <taffit at debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: AE14 AD01 426D 2BFB 82EF 7E1E B82A 217A FDFE 09F2
# Subkey fingerprint: 7875 4D07 BC09 5C74 48F7 8D66 058C 1CF9 44F6 BD3C
apps/activity/ajax/fetch.php | 6 +-
apps/activity/lib/api.php | 6 +-
apps/activity/lib/mailqueuehandler.php | 12 +-
apps/activity/lib/parameterhelper.php | 19 +-
apps/activity/rss.php | 6 +-
apps/activity/tests/datahelpertest.php | 6 +
apps/activity/tests/grouphelpertest.php | 1 +
apps/activity/tests/parameterhelpertest.php | 23 +-
apps/bookmarks/lib/bookmarks.php | 2 +-
.../templates/part.choosecalendar.rowfields.php | 11 +-
apps/files/download.php | 2 +-
apps/files_encryption/lib/util.php | 11 +-
apps/files_encryption/tests/hooks.php | 24 +-
apps/files_encryption/tests/trashbin.php | 72 +++++
apps/files_external/js/settings.js | 45 +--
apps/files_external/lib/owncloud.php | 4 +-
apps/files_external/lib/smb_oc.php | 14 +-
apps/files_external/tests/owncloudfunctions.php | 8 +
apps/files_sharing/lib/cache.php | 22 ++
apps/files_sharing/lib/helper.php | 16 +-
apps/files_sharing/lib/sharedmount.php | 4 +-
apps/files_sharing/publicwebdav.php | 3 +-
apps/files_sharing/tests/helper.php | 6 +-
apps/files_sharing/tests/propagation.php | 90 ++++++
apps/files_trashbin/lib/trashbin.php | 6 +-
apps/files_versions/download.php | 2 +-
apps/updater/css/updater.css | 1 -
apps/updater/templates/admin.php | 6 +-
apps/user_ldap/group_ldap.php | 100 ++++--
apps/user_ldap/lib/access.php | 22 +-
apps/user_ldap/lib/connection.php | 10 +-
apps/user_ldap/lib/ldap.php | 4 +
apps/user_ldap/lib/user/manager.php | 17 +-
apps/user_ldap/lib/wizard.php | 14 +-
apps/user_ldap/tests/group_ldap.php | 91 +++++-
apps/user_ldap/tests/user/manager.php | 4 -
apps/user_ldap/tests/user_ldap.php | 237 +++++++++++---
apps/user_ldap/user_ldap.php | 16 +-
config/config.sample.php | 3 +
core/ajax/share.php | 4 +-
.../doc/admin/release/_images/external-sites-1.png | Bin 0 -> 80744 bytes
.../doc/admin/release/_images/external-sites-2.png | Bin 0 -> 20024 bytes
.../doc/admin/release/_images/external-sites-3.png | Bin 0 -> 20519 bytes
.../admin/release/_images/external-storage-ftp.png | Bin 10805 -> 20913 bytes
.../configuration/activity_configuration.txt | 32 ++
.../background_jobs_configuration.txt | 4 +
.../big_file_upload_configuration.txt | 4 +
.../configuration/config_sample_php_parameters.txt | 19 ++
.../_sources/configuration/external_sites.txt | 57 ++++
.../external_storage_configuration.txt | 26 +-
.../external_storage_configuration_gui.txt | 26 +-
.../_sources/configuration/harden_server.txt | 155 +++++++++
.../admin/release/_sources/configuration/index.txt | 3 +
.../js_css_asset_management_configuration.txt | 2 +
.../_sources/configuration/user_auth_ldap.txt | 1 +
.../_sources/installation/installation_wizard.txt | 2 +
.../_sources/installation/linux_installation.txt | 8 +-
.../_sources/installation/nginx_configuration.txt | 11 +
core/doc/admin/release/_sources/issues/index.txt | 179 ++++++++++-
.../_sources/maintenance/enable_maintenance.txt | 12 +-
.../admin/release/_sources/maintenance/update.txt | 35 +-
.../admin/release/_sources/maintenance/upgrade.txt | 175 +++++++---
...figuration.html => activity_configuration.html} | 64 ++--
.../configuration/antivirus_configuration.html | 7 +-
.../configuration/automatic_configuration.html | 5 +-
.../background_jobs_configuration.html | 11 +-
.../big_file_upload_configuration.html | 11 +-
.../collaborative_documents_configuration.html | 5 +-
.../config_sample_php_parameters.html | 19 +-
.../configuration/custom_client_configuration.html | 5 +-
.../configuration/database_configuration.html | 5 +-
.../release/configuration/email_configuration.html | 5 +-
.../configuration/encryption_configuration.html | 5 +-
...arch_configuration.html => external_sites.html} | 81 +++--
.../external_storage_configuration.html | 31 +-
.../external_storage_configuration_gui.html | 27 +-
.../configuration/file_sharing_configuration.html | 7 +-
.../configuration/files_locking_enabling.html | 7 +-
.../admin/release/configuration/harden_server.html | 353 +++++++++++++++++++++
core/doc/admin/release/configuration/index.html | 25 +-
.../js_css_asset_management_configuration.html | 12 +-
.../configuration/knowledgebase_configuration.html | 5 +-
.../configuration/language_configuration.html | 5 +-
.../configuration/logging_configuration.html | 5 +-
.../admin/release/configuration/occ_command.html | 5 +-
.../release/configuration/performance_tips.html | 5 +-
.../configuration/previews_configuration.html | 5 +-
.../configuration/reset_admin_password.html | 5 +-
.../configuration/reverse_proxy_configuration.html | 5 +-
.../configuration/search_configuration.html | 5 +-
.../server_to_server_configuration.html | 5 +-
.../serving_static_files_configuration.html | 5 +-
.../thirdparty_php_configuration.html | 5 +-
.../configuration/user_auth_ftp_smb_imap.html | 5 +-
.../release/configuration/user_auth_ldap.html | 6 +-
.../configuration/user_auth_ldap_cleanup.html | 5 +-
.../release/configuration/user_configuration.html | 5 +-
core/doc/admin/release/contents.html | 41 ++-
core/doc/admin/release/genindex.html | 2 +-
core/doc/admin/release/index.html | 2 +-
.../installation/appliance_installation.html | 2 +-
.../installation/apps_management_installation.html | 2 +-
.../installation/hiawatha_configuration.html | 2 +-
core/doc/admin/release/installation/index.html | 2 +-
.../release/installation/installation_wizard.html | 4 +-
.../installation/lighttpd_configuration.html | 2 +-
.../release/installation/linux_installation.html | 8 +-
.../release/installation/macos_installation.html | 2 +-
.../release/installation/nginx_configuration.html | 17 +-
.../release/installation/others_installation.html | 2 +-
.../installation/selinux_configuration.html | 2 +-
.../release/installation/source_installation.html | 2 +-
.../release/installation/ucs_installation.html | 2 +-
.../release/installation/windows_installation.html | 2 +-
.../release/installation/yaws_configuration.html | 2 +-
core/doc/admin/release/issues/index.html | 209 +++++++++++-
core/doc/admin/release/maintenance/backup.html | 2 +-
core/doc/admin/release/maintenance/convert_db.html | 2 +-
.../release/maintenance/enable_maintenance.html | 10 +-
core/doc/admin/release/maintenance/index.html | 5 +-
core/doc/admin/release/maintenance/migrating.html | 2 +-
core/doc/admin/release/maintenance/restore.html | 2 +-
core/doc/admin/release/maintenance/update.html | 35 +-
core/doc/admin/release/maintenance/upgrade.html | 170 +++++++---
core/doc/admin/release/search.html | 2 +-
core/doc/admin/release/videos.html | 2 +-
core/doc/admin/release/whats_new_admin.html | 2 +-
core/doc/user/_images/calendar_caldav_icon.png | Bin 0 -> 314 bytes
core/doc/user/_images/calendar_caldav_ios.png | Bin 0 -> 18510 bytes
core/doc/user/_images/calendar_caldav_link.png | Bin 0 -> 9789 bytes
core/doc/user/_images/deleted_files.png | Bin 25471 -> 0 bytes
core/doc/user/_images/gear.png | Bin 0 -> 452 bytes
.../_sources/external_storage/google_drive.txt | 2 +-
core/doc/user/_sources/files/deletedfiles.txt | 116 ++++---
core/doc/user/_sources/files/files.txt | 8 +
core/doc/user/_sources/pim/calendar.txt | 44 ++-
core/doc/user/_sources/pim/troubleshooting.txt | 76 +----
core/doc/user/_sources/webinterface.txt | 3 +
core/doc/user/bookmarks.html | 2 +-
core/doc/user/contents.html | 12 +-
core/doc/user/documents.html | 2 +-
core/doc/user/external_storage/google_drive.html | 4 +-
.../user/files/configuring_big_file_upload.html | 2 +-
core/doc/user/files/deletedfiles.html | 103 +++---
core/doc/user/files/encryption.html | 2 +-
core/doc/user/files/files.html | 7 +-
core/doc/user/files/filesweb.html | 2 +-
core/doc/user/files/index.html | 2 +-
core/doc/user/files/quota.html | 2 +-
core/doc/user/files/server_to_server_using.html | 2 +-
core/doc/user/files/sync.html | 2 +-
core/doc/user/files/versioncontrol.html | 2 +-
core/doc/user/genindex.html | 2 +-
core/doc/user/index.html | 2 +-
core/doc/user/pim/calendar.html | 43 +--
core/doc/user/pim/contacts.html | 2 +-
core/doc/user/pim/index.html | 2 +-
core/doc/user/pim/sync_ios.html | 2 +-
core/doc/user/pim/sync_kde.html | 2 +-
core/doc/user/pim/sync_osx.html | 2 +-
core/doc/user/pim/sync_thunderbird.html | 2 +-
core/doc/user/pim/troubleshooting.html | 67 +---
core/doc/user/search.html | 2 +-
core/doc/user/userpreferences.html | 2 +-
core/doc/user/webinterface.html | 7 +-
core/doc/user/whats_new.html | 2 +-
core/js/share.js | 4 +
core/js/update.js | 12 +-
core/routes.php | 4 +
core/templates/login.php | 6 +
core/templates/update.admin.php | 2 +-
core/user/controller.php | 31 ++
cron.php | 27 +-
lib/base.php | 62 ++--
lib/private/connector/sabre/maintenanceplugin.php | 3 +
lib/private/db/statementwrapper.php | 99 ------
lib/private/files.php | 2 +-
lib/private/files/filesystem.php | 62 ++--
lib/private/files/storage/local.php | 1 +
lib/private/files/storage/mappedlocal.php | 1 +
lib/private/group/manager.php | 5 +-
lib/private/hook.php | 3 +
lib/private/mail.php | 7 +-
lib/private/preview/office-cl.php | 5 +-
lib/private/response.php | 23 +-
lib/private/servernotavailableexception.php | 27 ++
lib/private/share/mailnotifications.php | 19 +-
lib/private/share/share.php | 5 +-
lib/private/tempmanager.php | 14 +-
lib/private/user/nouserexception.php | 14 +
lib/public/response.php | 8 +
ocs/v1.php | 4 +-
public.php | 2 +-
version.php | 8 +-
194 files changed, 3019 insertions(+), 983 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