[Pkg-owncloud-commits] [owncloud] 14/16: Merge tag 'upstream/7.0.4_rc2+dfsg'
David Prévot
taffit at moszumanska.debian.org
Sun Dec 7 20:58:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit d1ef71e2b07888db550d780d3c4b4834673b4914
Merge: 6ab09a1 2081f76
Author: David Prévot <taffit at debian.org>
Date: Sun Dec 7 15:30:10 2014 -0400
Merge tag 'upstream/7.0.4_rc2+dfsg'
Upstream version 7.0.4~rc2+dfsg
apps/files_sharing/appinfo/database.xml | 2 +-
apps/gallery/js/slideshow.js | 6 +-
apps/user_ldap/appinfo/register_command.php | 1 +
apps/user_ldap/command/search.php | 100 +++++++++++
apps/user_ldap/lib/access.php | 52 +++++-
apps/user_ldap/user_ldap.php | 5 +
config/config.sample.php | 29 ++-
.../configuration/config_sample_php_parameters.txt | 103 +++++++++--
core/doc/admin/_sources/configuration/index.txt | 2 +-
core/doc/admin/_sources/contents.txt | 2 +-
core/doc/admin/_sources/index.txt | 1 +
core/doc/admin/_sources/installation/index.txt | 5 +-
.../_sources/installation/linux_installation.txt | 17 +-
.../installation/selinux_configuration.txt | 36 ++++
core/doc/admin/_sources/issues/index.txt | 34 +++-
core/doc/admin/_sources/maintenance/index.txt | 2 +-
.../configuration/antivirus_configuration.html | 6 +-
.../configuration/automatic_configuration.html | 6 +-
.../background_jobs_configuration.html | 6 +-
.../big_file_upload_configuration.html | 6 +-
.../collaborative_documents_configuration.html | 6 +-
.../config_sample_php_parameters.html | 86 +++++++--
.../configuration/custom_client_configuration.html | 6 +-
.../configuration/database_configuration.html | 6 +-
.../admin/configuration/email_configuration.html | 6 +-
.../configuration/encryption_configuration.html | 6 +-
.../external_storage_configuration.html | 6 +-
.../external_storage_configuration_gui.html | 6 +-
.../configuration/file_sharing_configuration.html | 6 +-
.../configuration/files_locking_enabling.html | 6 +-
core/doc/admin/configuration/index.html | 199 ++++++++++++++++++---
.../js_css_asset_management_configuration.html | 6 +-
.../configuration/knowledgebase_configuration.html | 6 +-
.../configuration/language_configuration.html | 6 +-
.../admin/configuration/logging_configuration.html | 6 +-
.../configuration/previews_configuration.html | 6 +-
.../configuration/reverse_proxy_configuration.html | 6 +-
.../admin/configuration/search_configuration.html | 6 +-
.../server_to_server_configuration.html | 6 +-
.../serving_static_files_configuration.html | 6 +-
.../thirdparty_php_configuration.html | 6 +-
.../configuration/user_auth_ftp_smb_imap.html | 6 +-
core/doc/admin/configuration/user_auth_ldap.html | 6 +-
.../admin/configuration/user_configuration.html | 6 +-
core/doc/admin/contents.html | 28 ++-
core/doc/admin/genindex.html | 6 +-
core/doc/admin/index.html | 7 +-
.../admin/installation/appliance_installation.html | 7 +-
.../installation/apps_management_installation.html | 7 +-
.../admin/installation/hiawatha_configuration.html | 7 +-
core/doc/admin/installation/index.html | 74 ++++++--
.../admin/installation/installation_wizard.html | 7 +-
.../admin/installation/lighttpd_configuration.html | 7 +-
.../doc/admin/installation/linux_installation.html | 20 ++-
.../doc/admin/installation/macos_installation.html | 7 +-
.../admin/installation/nginx_configuration.html | 7 +-
.../admin/installation/others_installation.html | 7 +-
...nfiguration.html => selinux_configuration.html} | 64 ++++---
.../admin/installation/source_installation.html | 7 +-
core/doc/admin/installation/ucs_installation.html | 7 +-
.../admin/installation/windows_installation.html | 7 +-
.../doc/admin/installation/yaws_configuration.html | 9 +-
core/doc/admin/issues/index.html | 42 +++--
core/doc/admin/maintenance/backup.html | 6 +-
core/doc/admin/maintenance/convert_db.html | 6 +-
core/doc/admin/maintenance/enable_maintenance.html | 6 +-
core/doc/admin/maintenance/index.html | 34 +++-
core/doc/admin/maintenance/migrating.html | 6 +-
core/doc/admin/maintenance/restore.html | 6 +-
core/doc/admin/maintenance/update.html | 6 +-
core/doc/admin/maintenance/upgrade.html | 6 +-
core/doc/admin/objects.inv | Bin 296 -> 296 bytes
core/doc/admin/search.html | 6 +-
core/doc/admin/whats_new_admin.html | 6 +-
core/doc/user/_sources/files/filesweb.txt | 37 ++--
core/doc/user/bookmarks.html | 8 +-
core/doc/user/contents.html | 12 +-
core/doc/user/documents.html | 8 +-
core/doc/user/external_storage/google_drive.html | 8 +-
.../user/files/configuring_big_file_upload.html | 8 +-
core/doc/user/files/deletedfiles.html | 8 +-
core/doc/user/files/encryption.html | 8 +-
core/doc/user/files/files.html | 8 +-
core/doc/user/files/filesweb.html | 43 ++---
core/doc/user/files/index.html | 8 +-
core/doc/user/files/quota.html | 8 +-
core/doc/user/files/server_to_server_using.html | 8 +-
core/doc/user/files/sync.html | 8 +-
core/doc/user/files/versioncontrol.html | 8 +-
core/doc/user/genindex.html | 8 +-
core/doc/user/index.html | 10 +-
core/doc/user/installing_apps.html | 8 +-
core/doc/user/objects.inv | Bin 296 -> 295 bytes
core/doc/user/pim/calendar.html | 8 +-
core/doc/user/pim/contacts.html | 8 +-
core/doc/user/pim/index.html | 8 +-
core/doc/user/pim/sync_ios.html | 8 +-
core/doc/user/pim/sync_kde.html | 8 +-
core/doc/user/pim/sync_osx.html | 8 +-
core/doc/user/pim/sync_thunderbird.html | 8 +-
core/doc/user/pim/troubleshooting.html | 8 +-
core/doc/user/search.html | 8 +-
core/doc/user/userpreferences.html | 8 +-
core/doc/user/webinterface.html | 8 +-
core/doc/user/whats_new.html | 10 +-
core/js/share.js | 2 +-
lib/base.php | 6 +-
lib/private/helper.php | 8 +
lib/private/request.php | 33 +++-
lib/private/setup.php | 2 +-
settings/admin.php | 2 +
settings/templates/admin.php | 20 ++-
version.php | 6 +-
113 files changed, 1159 insertions(+), 485 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