[Pkg-owncloud-commits] [owncloud] 44/46: Merge tag 'upstream/7.0.3_rc2_20141023+dfsg'
David Prévot
taffit at moszumanska.debian.org
Fri Oct 24 15:11:45 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 1851c30c86e93449216e111b74fa6be50bc0d1cc
Merge: 5bf1800 cfcb18d
Author: David Prévot <taffit at debian.org>
Date: Fri Oct 24 10:00:06 2014 -0400
Merge tag 'upstream/7.0.3_rc2_20141023+dfsg'
Upstream version 7.0.3~rc2~20141023+dfsg
# gpg: Signature faite le ven. 24 oct. 2014 09:59:59 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/contacts/lib/controller/pagecontroller.php | 4 +
apps/contacts/lib/utils/properties.php | 4 +-
apps/files_encryption/lib/crypt.php | 7 +-
apps/files_encryption/lib/helper.php | 2 +-
apps/files_encryption/tests/crypt.php | 8 +
apps/files_encryption/tests/helper.php | 18 +-
apps/files_encryption/tests/hooks.php | 8 +
apps/files_encryption/tests/keymanager.php | 8 +
apps/files_encryption/tests/proxy.php | 8 +
apps/files_encryption/tests/share.php | 8 +
apps/files_encryption/tests/stream.php | 8 +
apps/files_encryption/tests/trashbin.php | 8 +
apps/files_encryption/tests/util.php | 9 +
apps/files_encryption/tests/webdav.php | 8 +
apps/files_external/js/settings.js | 2 +-
apps/files_external/lib/amazons3.php | 114 +--
apps/files_external/lib/dropbox.php | 1 +
apps/files_external/lib/ftp.php | 2 +-
apps/files_external/lib/google.php | 1 +
apps/files_external/lib/sftp.php | 39 +-
apps/files_external/lib/swift.php | 122 ++-
apps/files_sharing/js/public.js | 2 +-
apps/files_sharing/lib/external/storage.php | 5 +
apps/files_sharing/public.php | 2 +-
apps/files_sharing/tests/base.php | 37 +-
apps/updater/ajax/backup.php | 4 +-
apps/updater/ajax/backup/list.php | 2 -
apps/updater/css/updater.css | 76 +-
apps/updater/js/app.js | 15 +-
apps/updater/js/controllers.js | 173 ++--
apps/updater/lib/app.php | 5 +-
apps/updater/lib/helper.php | 10 +-
apps/updater/lib/location/apps.php | 12 +-
apps/updater/lib/permissionexception.php | 8 +-
apps/updater/templates/admin.php | 2 +-
apps/updater/templates/update.php | 62 +-
apps/updater/update.php | 6 +
apps/user_ldap/appinfo/update.php | 4 +-
apps/user_ldap/appinfo/version | 2 +-
apps/user_ldap/css/settings.css | 25 +
apps/user_ldap/group_ldap.php | 63 +-
apps/user_ldap/js/experiencedAdmin.js | 100 +++
apps/user_ldap/js/ldapFilter.js | 73 +-
apps/user_ldap/js/settings.js | 348 +++++---
apps/user_ldap/lib/access.php | 2 +-
apps/user_ldap/lib/configuration.php | 179 ++--
apps/user_ldap/settings.php | 1 +
.../templates/part.wizard-groupfilter.php | 7 +-
apps/user_ldap/templates/part.wizard-server.php | 10 +
.../user_ldap/templates/part.wizard-userfilter.php | 7 +-
apps/user_ldap/templates/part.wizardcontrols.php | 1 +
apps/user_ldap/tests/group_ldap.php | 33 +-
config/config.sample.php | 39 +-
core/doc/admin/_images/encryption1.png | Bin 0 -> 15491 bytes
core/doc/admin/_images/encryption2.png | Bin 0 -> 4095 bytes
core/doc/admin/_images/encryption3.png | Bin 0 -> 9018 bytes
core/doc/admin/_images/encryption4.png | Bin 0 -> 4498 bytes
core/doc/admin/_images/encryption5.png | Bin 0 -> 18907 bytes
core/doc/admin/_images/encryption6.png | Bin 0 -> 14219 bytes
core/doc/admin/_images/encryption7.png | Bin 0 -> 12526 bytes
core/doc/admin/_images/encryption8.png | Bin 0 -> 15038 bytes
core/doc/admin/_images/encryption9.png | Bin 0 -> 12567 bytes
core/doc/admin/_images/encryption_enabling.png | Bin 30317 -> 0 bytes
.../_sources/configuration/background_jobs.txt | 2 +-
.../configuration_config_sample_php.txt | 937 +++++++++++++++++++++
.../configuration/configuration_encryption.txt | 197 +++--
.../configuration/configuration_file_sharing.txt | 6 +
.../configuration/configuration_files_locking.txt | 18 +
core/doc/admin/_sources/configuration/index.txt | 1 +
core/doc/admin/_sources/index.txt | 1 +
.../_sources/installation/configuration_nginx.txt | 2 +-
core/doc/admin/_sources/maintenance/update.txt | 9 +-
core/doc/admin/_sources/maintenance/upgrade.txt | 10 +-
core/doc/admin/_sources/whats_new_admin.txt | 4 +
core/doc/admin/configuration/auth_ldap.html | 3 +-
core/doc/admin/configuration/background_jobs.html | 5 +-
.../configuration/configuration-antivirus.html | 3 +-
.../configuration/configuration_3rdparty.html | 3 +-
.../admin/configuration/configuration_apps.html | 3 +-
.../admin/configuration/configuration_assets.html | 3 +-
.../configuration/configuration_automation.html | 3 +-
.../configuration_config_sample_php.html | 809 ++++++++++++++++++
.../configuration_custom_clients.html | 3 +-
.../configuration/configuration_database.html | 5 +-
.../configuration/configuration_encryption.html | 228 +++--
.../configuration/configuration_file_sharing.html | 11 +-
.../configuration_files_locking.html} | 47 +-
.../configuration/configuration_knowledgebase.html | 5 +-
.../configuration/configuration_language.html | 3 +-
.../admin/configuration/configuration_logging.html | 3 +-
.../admin/configuration/configuration_mail.html | 3 +-
.../admin/configuration/configuration_preview.html | 3 +-
.../configuration/configuration_reverseproxy.html | 3 +-
.../admin/configuration/configuration_users.html | 5 +-
.../configuration/configuring_big_file_upload.html | 3 +-
.../admin/configuration/configuring_documents.html | 3 +-
.../admin/configuration/configuring_search.html | 5 +-
.../admin/configuration/custom_mount_config.html | 3 +-
.../configuration/custom_mount_config_gui.html | 3 +-
.../admin/configuration/custom_user_backend.html | 3 +-
core/doc/admin/configuration/index.html | 6 +-
.../configuration/server_to_server_managing.html | 3 +-
core/doc/admin/configuration/xsendfile.html | 3 +-
core/doc/admin/contents.html | 27 +-
core/doc/admin/index.html | 3 +-
.../admin/installation/configuration_nginx.html | 2 +-
core/doc/admin/maintenance/index.html | 2 +-
core/doc/admin/maintenance/update.html | 9 +-
core/doc/admin/maintenance/upgrade.html | 9 +-
core/doc/admin/whats_new_admin.html | 8 +
core/doc/user/_images/encryption1.png | Bin 0 -> 4095 bytes
core/doc/user/_images/encryption2.png | Bin 0 -> 8914 bytes
core/doc/user/_images/encryption3.png | Bin 0 -> 14219 bytes
core/doc/user/_images/encryption4.png | Bin 0 -> 18907 bytes
.../_images/oc_personal_settings_dropdown1.png | Bin 14895 -> 0 bytes
.../user/_images/oc_personal_settings_window.png | Bin 42959 -> 0 bytes
core/doc/user/_images/quota1.png | Bin 0 -> 3730 bytes
core/doc/user/_sources/files/encryption.txt | 134 ++-
core/doc/user/_sources/files/files.txt | 7 +-
core/doc/user/_sources/files/filesweb.txt | 13 +-
core/doc/user/_sources/files/quota.txt | 140 +--
core/doc/user/_sources/whats_new.txt | 7 +
core/doc/user/contents.html | 16 +-
.../user/files/configuring_big_file_upload.html | 2 +-
core/doc/user/files/deletedfiles.html | 2 +-
core/doc/user/files/encryption.html | 141 +++-
core/doc/user/files/files.html | 9 +-
core/doc/user/files/filesweb.html | 13 +-
core/doc/user/files/index.html | 4 +-
core/doc/user/files/quota.html | 155 +---
core/doc/user/files/server_to_server_using.html | 2 +-
core/doc/user/files/sync.html | 4 +-
core/doc/user/files/versioncontrol.html | 2 +-
core/doc/user/index.html | 2 +-
core/doc/user/userpreferences.html | 2 +-
core/doc/user/whats_new.html | 8 +
core/js/share.js | 1 +
lib/private/app.php | 28 +-
.../files/objectstore/homeobjectstorestorage.php | 6 -
.../files/objectstore/objectstorestorage.php | 5 +-
lib/private/group/manager.php | 24 +-
lib/private/preview.php | 14 +-
lib/private/request.php | 2 +-
lib/private/server.php | 15 +
lib/private/share/share.php | 6 +-
lib/private/templatelayout.php | 51 +-
lib/private/user.php | 9 +-
lib/private/user/user.php | 14 +-
lib/private/util.php | 55 +-
version.php | 4 +-
150 files changed, 3827 insertions(+), 1204 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