[Pkg-owncloud-commits] [owncloud] 41/44: Merge tag 'upstream/6.0.2+dfsg'
David Prévot
taffit at moszumanska.debian.org
Fri Mar 7 13:27:27 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 0ffad37b99704e7d8984421d293fabf4478a8a70
Merge: 060c500 4863f8b
Author: David Prévot <taffit at debian.org>
Date: Fri Mar 7 09:09:29 2014 -0300
Merge tag 'upstream/6.0.2+dfsg'
Upstream version 6.0.2+dfsg
# gpg: Signature faite le ven. 07 mars 2014 09:07:37 GFT
# 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
.../Classes/PHPExcel/Reader/Excel2003XML.php | 6 +-
.../PHPExcel/Classes/PHPExcel/Reader/Excel2007.php | 57 ++++++---
.../PHPExcel/Classes/PHPExcel/Reader/Gnumeric.php | 3 +-
.../PHPExcel/Classes/PHPExcel/Reader/OOCalc.php | 9 +-
3rdparty/Sabre/DAV/Client.php | 3 +-
3rdparty/Sabre/DAV/Locks/Plugin.php | 3 +-
3rdparty/Sabre/DAV/XMLUtil.php | 3 +-
3rdparty/getid3/getid3.lib.php | 3 +-
3rdparty/phpdocx/classes/CreateDocx.inc | 35 ++++--
3rdparty/phpdocx/classes/CreateMath.inc | 3 +-
3rdparty/phpdocx/classes/Docx2Text.inc | 15 ++-
3rdparty/phpdocx/classes/TransformDoc.inc | 12 +-
3rdparty/phpdocx/classes/WordML.inc | 3 +-
apps/contacts/appinfo/app.php | 6 +-
apps/contacts/lib/addressbookprovider.php | 2 +-
.../lib/controller/contactphotocontroller.php | 30 ++---
apps/contacts/lib/searchprovider.php | 12 +-
apps/files_encryption/lib/proxy.php | 33 ++++--
apps/files_encryption/lib/session.php | 8 ++
apps/files_encryption/lib/stream.php | 3 +
apps/files_encryption/lib/util.php | 8 ++
apps/files_sharing/lib/api.php | 12 +-
apps/files_sharing/templates/authenticate.php | 5 +-
apps/files_sharing/tests/api.php | 68 +++++++++++
apps/files_sharing/tests/base.php | 1 +
apps/firstrunwizard/css/colorbox.css | 8 +-
apps/firstrunwizard/templates/wizard.php | 16 ++-
apps/updater/appinfo/app.php | 4 +
apps/updater/lib/backup.php | 1 +
apps/updater/lib/downloader.php | 3 +-
apps/updater/lib/helper.php | 1 +
apps/updater/lib/location/core.php | 1 +
apps/updater/lib/updater.php | 3 +-
apps/user_ldap/user_proxy.php | 17 ++-
core/css/fixes.css | 5 -
core/css/icons.css | 9 +-
core/css/multiselect.css | 8 +-
core/css/styles.css | 12 ++
.../_sources/{ => apps}/activity/Configuration.txt | 0
.../_sources/{ => apps}/activity/Introduction.txt | 0
.../_sources/{ => apps}/activity/RSS_Feed.txt | 0
.../{ => apps}/activity/Table_of_Contents.txt | 0
.../_sources/{ => apps}/activity/Utilization.txt | 0
.../admin/_sources/{ => apps}/activity/index.txt | 0
.../admin_dependencies_chk}/Configuration.txt | 0
.../admin_dependencies_chk}/Introduction.txt | 0
.../admin_dependencies_chk}/Table_of_Contents.txt | 0
.../admin_dependencies_chk}/Utilization.txt | 0
.../admin_dependencies_chk}/index.txt | 0
.../files_antivirus}/Configuration.txt | 0
.../files_antivirus}/Introduction.txt | 0
.../files_antivirus}/Table_of_Contents.txt | 0
.../{antivirus => apps/files_antivirus}/index.txt | 0
.../files_encryption}/Configuration.txt | 0
.../files_encryption}/File_Systems.txt | 0
.../files_encryption}/Introduction.txt | 0
.../files_encryption}/Table_of_Contents.txt | 0
.../files_encryption}/index.txt | 0
.../files_external}/Configuration.txt | 0
.../files_external}/Introduction.txt | 0
.../files_external}/Table_of_Contents.txt | 0
.../{external => apps/files_external}/index.txt | 0
.../files_sharing}/Configuration.txt | 0
.../files_sharing}/Introduction.txt | 0
.../files_sharing}/Retrieving_shared_data.txt | 0
.../files_sharing}/Table_of_Contents.txt | 0
.../files_sharing}/Utilization.txt | 0
.../{share_app => apps/files_sharing}/index.txt | 0
.../files_trashbin}/Configuration_and_storage_.txt | 0
.../files_trashbin}/Introduction.txt | 0
.../files_trashbin}/Table_of_Contents.txt | 0
.../files_trashbin}/Utilization.txt | 0
.../{undelete => apps/files_trashbin}/index.txt | 0
.../files_versions}/Configuration_and_storage.txt | 0
.../files_versions}/Introduction.txt | 0
.../files_versions}/Utilization.txt | 0
.../{versions => apps/files_versions}/index.txt | 0
.../firstrunwizard}/Configuration.txt | 0
.../firstrunwizard}/Introduction.txt | 0
.../{first_run => apps/firstrunwizard}/Links.txt | 0
.../firstrunwizard}/Table_of_Contents.txt | 0
.../{first_run => apps/firstrunwizard}/Usage.txt | 0
.../{first_run => apps/firstrunwizard}/index.txt | 0
.../{LDAP => apps/user_ldap}/CONFIGURATION.txt | 0
.../{LDAP => apps/user_ldap}/Introduction.txt | 0
.../{LDAP => apps/user_ldap}/Table_of_Contents.txt | 0
.../_sources/{LDAP => apps/user_ldap}/index.txt | 0
.../_sources/{ => apps}/viewers/Configuration.txt | 0
.../_sources/{ => apps}/viewers/Introduction.txt | 0
.../_sources/{ => apps}/viewers/Utilization.txt | 0
.../admin/_sources/{ => apps}/viewers/index.txt | 0
.../doc/admin/_sources/configuration/auth_ldap.txt | 25 ++--
core/doc/admin/_sources/index.txt | 6 +-
.../_sources/installation/installation_source.txt | 1 +
.../admin/{ => apps}/activity/Configuration.html | 36 +++---
.../admin/{ => apps}/activity/Introduction.html | 34 +++---
core/doc/admin/{ => apps}/activity/RSS_Feed.html | 38 +++---
.../{ => apps}/activity/Table_of_Contents.html | 34 +++---
.../doc/admin/{ => apps}/activity/Utilization.html | 52 ++++-----
core/doc/admin/{ => apps}/activity/index.html | 34 +++---
.../admin_dependencies_chk}/Configuration.html | 36 +++---
.../admin_dependencies_chk}/Introduction.html | 34 +++---
.../admin_dependencies_chk}/Table_of_Contents.html | 34 +++---
.../admin_dependencies_chk}/Utilization.html | 36 +++---
.../admin_dependencies_chk}/index.html | 34 +++---
.../files_antivirus}/Configuration.html | 44 +++----
.../files_antivirus}/Introduction.html | 34 +++---
.../files_antivirus}/Table_of_Contents.html | 34 +++---
.../{antivirus => apps/files_antivirus}/index.html | 34 +++---
.../files_encryption}/Configuration.html | 46 ++++----
.../files_encryption}/File_Systems.html | 46 ++++----
.../files_encryption}/Introduction.html | 38 +++---
.../files_encryption}/Table_of_Contents.html | 34 +++---
.../files_encryption}/index.html | 34 +++---
.../files_external}/Configuration.html | 130 ++++++++++-----------
.../files_external}/Introduction.html | 34 +++---
.../files_external}/Table_of_Contents.html | 34 +++---
.../{external => apps/files_external}/index.html | 34 +++---
.../files_sharing}/Configuration.html | 38 +++---
.../files_sharing}/Introduction.html | 34 +++---
.../files_sharing}/Retrieving_shared_data.html | 42 +++----
.../files_sharing}/Table_of_Contents.html | 34 +++---
.../files_sharing}/Utilization.html | 44 +++----
.../{share_app => apps/files_sharing}/index.html | 34 +++---
.../Configuration_and_storage_.html | 38 +++---
.../files_trashbin}/Introduction.html | 34 +++---
.../files_trashbin}/Table_of_Contents.html | 34 +++---
.../files_trashbin}/Utilization.html | 50 ++++----
.../{undelete => apps/files_trashbin}/index.html | 34 +++---
.../files_versions}/Configuration_and_storage.html | 48 ++++----
.../files_versions}/Introduction.html | 34 +++---
.../files_versions}/Utilization.html | 44 +++----
.../{versions => apps/files_versions}/index.html | 34 +++---
.../firstrunwizard}/Configuration.html | 36 +++---
.../firstrunwizard}/Introduction.html | 34 +++---
.../{first_run => apps/firstrunwizard}/Links.html | 42 +++----
.../firstrunwizard}/Table_of_Contents.html | 34 +++---
.../{first_run => apps/firstrunwizard}/Usage.html | 38 +++---
.../{first_run => apps/firstrunwizard}/index.html | 34 +++---
.../{LDAP => apps/user_ldap}/CONFIGURATION.html | 52 ++++-----
.../{LDAP => apps/user_ldap}/Introduction.html | 34 +++---
.../user_ldap}/Table_of_Contents.html | 34 +++---
core/doc/admin/{LDAP => apps/user_ldap}/index.html | 34 +++---
.../admin/{ => apps}/viewers/Configuration.html | 38 +++---
.../doc/admin/{ => apps}/viewers/Introduction.html | 34 +++---
core/doc/admin/{ => apps}/viewers/Utilization.html | 38 +++---
core/doc/admin/{ => apps}/viewers/index.html | 34 +++---
core/doc/admin/config/APPS.html | 2 +-
core/doc/admin/config/Code_Locations.html | 2 +-
core/doc/admin/config/Default_Parameters.html | 2 +-
core/doc/admin/config/Deleted_Items.html | 2 +-
core/doc/admin/config/Introduction.html | 2 +-
core/doc/admin/config/Logging.html | 2 +-
core/doc/admin/config/Mail_Parameters.html | 2 +-
core/doc/admin/config/Maintenance.html | 2 +-
core/doc/admin/config/Miscellaneous.html | 2 +-
core/doc/admin/config/Previews.html | 2 +-
.../admin/config/Reverse_Proxy_Configurations.html | 2 +-
core/doc/admin/config/Session_Info.html | 2 +-
core/doc/admin/config/Table_of_Contents.html | 2 +-
core/doc/admin/config/User_Experience.html | 2 +-
core/doc/admin/config/Verification.html | 2 +-
core/doc/admin/config/index.html | 2 +-
core/doc/admin/configuration/auth_ldap.html | 27 ++---
core/doc/admin/configuration/background_jobs.html | 2 +-
.../configuration/configuration_3rdparty.html | 2 +-
.../admin/configuration/configuration_apps.html | 2 +-
.../configuration/configuration_automation.html | 2 +-
.../configuration_custom_clients.html | 2 +-
.../configuration/configuration_database.html | 2 +-
.../configuration/configuration_encryption.html | 2 +-
.../configuration/configuration_knowledgebase.html | 2 +-
.../configuration/configuration_language.html | 2 +-
.../admin/configuration/configuration_logging.html | 2 +-
.../admin/configuration/configuration_mail.html | 2 +-
.../configuration/configuration_maintenance.html | 2 +-
.../admin/configuration/configuration_preview.html | 2 +-
.../configuration/configuration_reverseproxy.html | 2 +-
.../admin/configuration/configuration_users.html | 2 +-
.../configuration/configuring_big_file_upload.html | 2 +-
.../admin/configuration/custom_mount_config.html | 2 +-
.../configuration/custom_mount_config_gui.html | 2 +-
.../admin/configuration/custom_user_backend.html | 2 +-
core/doc/admin/configuration/index.html | 2 +-
core/doc/admin/configuration/xsendfile.html | 2 +-
core/doc/admin/contents.html | 4 +-
core/doc/admin/cron/Introduction.html | 2 +-
core/doc/admin/cron/Usage.html | 2 +-
core/doc/admin/cron/index.html | 2 +-
core/doc/admin/genindex.html | 2 +-
core/doc/admin/index.html | 8 +-
core/doc/admin/installation/index.html | 4 +-
.../admin/installation/installation_appliance.html | 2 +-
.../doc/admin/installation/installation_linux.html | 2 +-
.../doc/admin/installation/installation_macos.html | 2 +-
.../admin/installation/installation_others.html | 2 +-
.../admin/installation/installation_source.html | 45 ++++++-
core/doc/admin/installation/installation_ucs.html | 2 +-
.../admin/installation/installation_windows.html | 2 +-
core/doc/admin/issues/index.html | 2 +-
core/doc/admin/maintenance/backup.html | 2 +-
core/doc/admin/maintenance/index.html | 2 +-
core/doc/admin/maintenance/migrating.html | 2 +-
core/doc/admin/maintenance/restore.html | 2 +-
core/doc/admin/maintenance/update.html | 2 +-
core/doc/admin/quota/Checking_available_space.html | 2 +-
core/doc/admin/quota/Excluded_from_quota.html | 2 +-
core/doc/admin/quota/Introduction.html | 2 +-
core/doc/admin/quota/Sharing.html | 2 +-
core/doc/admin/quota/Table_of_Contents.html | 2 +-
core/doc/admin/quota/index.html | 2 +-
core/doc/admin/search.html | 2 +-
core/doc/admin/sharing_api/Contents.html | 2 +-
core/doc/admin/sharing_api/Create_a_new_Share.html | 2 +-
core/doc/admin/sharing_api/Delete_Share.html | 2 +-
core/doc/admin/sharing_api/Get_All_Shares.html | 2 +-
.../Get_Information_about_a_known_share.html | 2 +-
.../Get_Shares_from_a_Specific_File_or_Folder.html | 2 +-
core/doc/admin/sharing_api/Introduction.html | 2 +-
core/doc/admin/sharing_api/index.html | 2 +-
core/doc/admin/sync_client/Advanced_Usage.html | 2 +-
core/doc/admin/sync_client/Introduction.html | 2 +-
.../admin/sync_client/Obtaining_the_Client.html | 2 +-
.../admin/sync_client/Setting_up_an_Account.html | 2 +-
core/doc/admin/sync_client/Table_of_Contents.html | 2 +-
core/doc/admin/sync_client/Visual_Tour.html | 2 +-
core/doc/admin/sync_client/index.html | 2 +-
core/doc/admin/web_guide/Adding_Data.html | 2 +-
core/doc/admin/web_guide/Initial_Log_In.html | 2 +-
core/doc/admin/web_guide/Introduction.html | 2 +-
core/doc/admin/web_guide/Main_ownCloud_screen.html | 2 +-
core/doc/admin/web_guide/Navigation.html | 2 +-
.../admin/web_guide/Personal_Configurations.html | 2 +-
core/doc/admin/web_guide/Table_of_Contents.html | 2 +-
core/doc/admin/web_guide/index.html | 2 +-
core/doc/user/_sources/index.txt | 7 +-
core/doc/user/bookmarks.html | 2 +-
core/doc/user/contents.html | 4 +-
core/doc/user/documents.html | 2 +-
core/doc/user/external_storage/google_drive.html | 2 +-
.../user/files/configuring_big_file_upload.html | 2 +-
core/doc/user/files/deletedfiles.html | 2 +-
core/doc/user/files/encryption.html | 2 +-
core/doc/user/files/files.html | 2 +-
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/sync.html | 2 +-
core/doc/user/files/versioncontrol.html | 2 +-
core/doc/user/genindex.html | 2 +-
core/doc/user/index.html | 8 +-
core/doc/user/migration.html | 2 +-
core/doc/user/objects.inv | Bin 288 -> 294 bytes
core/doc/user/pim/calendar.html | 2 +-
core/doc/user/pim/contacts.html | 2 +-
core/doc/user/pim/index.html | 2 +-
core/doc/user/pim/sync_ios.html | 5 +-
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 | 2 +-
core/doc/user/search.html | 2 +-
core/doc/user/userpreferences.html | 2 +-
core/doc/user/webinterface.html | 4 +-
core/img/actions/checkmark-white.png | Bin 0 -> 286 bytes
core/img/actions/checkmark-white.svg | 4 +
core/js/config.php | 9 +-
core/l10n/de.php | 4 +-
core/l10n/de_DE.php | 4 +-
core/skeleton/ownCloudUserManual.pdf | Bin 1571890 -> 1571970 bytes
lib/private/db/mdb2schemamanager.php | 3 +
lib/private/db/mdb2schemareader.php | 2 +
lib/private/defaults.php | 7 ++
lib/private/helper.php | 2 +-
lib/private/user.php | 4 +-
lib/public/share.php | 16 ++-
settings/ajax/decryptall.php | 2 +
settings/js/users.js | 81 +++++++++----
version.php | 8 +-
279 files changed, 1669 insertions(+), 1338 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