[Pkg-owncloud-commits] [owncloud] 99/104: Merge tag 'upstream/6.0.1_rc1+dfsg'
David Prévot
taffit at moszumanska.debian.org
Sat Jan 18 13:33:44 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 efe913086bc187721f1219022b5493caf23673d4
Merge: 01fb293 31c1dad
Author: David Prévot <taffit at debian.org>
Date: Thu Jan 16 22:33:46 2014 -0400
Merge tag 'upstream/6.0.1_rc1+dfsg'
Upstream version 6.0.1~rc1+dfsg
# gpg: Signature faite le jeu. 16 janv. 2014 22:33:03 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
.htaccess | 3 +
apps/activity/js/script.js | 2 +-
apps/contacts/appinfo/migrate.php | 2 +-
apps/contacts/js/app.js | 40 +-
apps/contacts/js/contacts.js | 9 +-
apps/contacts/js/groups.js | 1 +
apps/contacts/lib/contact.php | 4 +-
apps/contacts/lib/controller/exportcontroller.php | 15 +-
apps/contacts/lib/utils/properties.php | 4 +-
apps/documents/ajax/documentController.php | 21 +-
apps/documents/ajax/download.php | 18 +
apps/documents/ajax/sessionController.php | 73 +-
apps/documents/appinfo/routes.php | 8 +-
apps/documents/css/style.css | 4 +
apps/documents/js/documents.js | 2 +-
apps/documents/js/viewer/viewer.js | 2 +-
apps/documents/lib/download/range.php | 18 +-
apps/documents/lib/download/simple.php | 11 +-
apps/documents/lib/file.php | 63 +-
apps/documents/lib/filter.php | 65 ++
apps/documents/lib/genesis.php | 7 +-
apps/documents/lib/storage.php | 32 +-
apps/files/download.php | 7 +-
apps/files/js/file-upload.js | 12 +-
apps/files/js/fileactions.js | 2 +-
apps/files/js/filelist.js | 52 +-
apps/files/js/files.js | 14 +-
apps/files/l10n/ru_RU.php | 17 -
apps/files/templates/part.breadcrumb.php | 12 +-
apps/files_encryption/hooks/hooks.php | 63 +-
apps/files_encryption/lib/helper.php | 3 +-
apps/files_encryption/lib/proxy.php | 20 +-
apps/files_encryption/lib/util.php | 68 +-
apps/files_encryption/tests/helper.php | 37 +
apps/files_encryption/tests/proxy.php | 69 +-
apps/files_encryption/tests/share.php | 27 +-
apps/files_encryption/tests/util.php | 6 +
apps/files_external/3rdparty/smb4php/smb.php | 6 +-
apps/files_external/js/dropbox.js | 17 +-
apps/files_external/js/google.js | 21 +-
apps/files_external/js/settings.js | 14 +-
apps/files_external/l10n/ru_RU.php | 6 -
apps/files_external/lib/config.php | 6 +-
apps/files_external/lib/webdav.php | 42 +-
apps/files_sharing/ajax/publicpreview.php | 4 +-
apps/files_sharing/js/public.js | 6 +-
apps/files_sharing/js/share.js | 2 +-
apps/files_sharing/l10n/ru_RU.php | 8 -
apps/files_sharing/lib/share/file.php | 2 +-
apps/files_sharing/lib/sharedstorage.php | 41 +-
apps/files_sharing/tests/base.php | 4 +-
apps/files_texteditor/js/editor.js | 7 -
apps/files_trashbin/download.php | 51 --
apps/files_trashbin/js/trash.js | 14 +-
apps/files_trashbin/l10n/ru_RU.php | 6 -
apps/files_trashbin/lib/trashbin.php | 6 +-
apps/files_trashbin/templates/part.breadcrumb.php | 8 +-
apps/files_versions/download.php | 7 +-
apps/files_versions/js/versions.js | 16 +-
apps/files_versions/lib/versions.php | 6 +-
apps/gallery/ajax/getimages.php | 3 +-
apps/gallery/ajax/image.php | 7 +-
apps/gallery/ajax/thumbnail.php | 9 +-
apps/gallery/js/gallery.js | 16 +-
apps/gallery/js/thumbnail.js | 4 +
apps/gallery/lib/thumbnail.php | 14 +-
apps/gallery/templates/public.php | 2 +-
apps/updater/ajax/update.php | 15 +-
apps/updater/js/controllers.js | 21 +-
apps/updater/lib/downloader.php | 6 +-
apps/updater/lib/helper.php | 10 +-
apps/updater/lib/location/apps.php | 18 +-
apps/updater/update.php | 2 +
apps/user_ldap/l10n/ru_RU.php | 12 -
apps/user_ldap/lib/access.php | 145 +++-
apps/user_ldap/lib/connection.php | 3 +-
apps/user_ldap/lib/wizard.php | 11 +-
apps/user_ldap/templates/part.settingcontrols.php | 2 +-
apps/user_ldap/templates/part.wizardcontrols.php | 2 +-
apps/user_ldap/tests/user_ldap.php | 54 ++
apps/user_ldap/user_ldap.php | 15 +-
apps/user_ldap/user_proxy.php | 15 +
core/command/user/report.php | 61 ++
core/css/styles.css | 14 +-
core/doc/admin/_images/oc_admin_app_page.png | Bin 0 -> 28370 bytes
core/doc/admin/_images/oc_admin_user_manage.png | Bin 0 -> 21025 bytes
.../_sources/configuration/configuration_apps.txt | 20 +-
.../_sources/configuration/configuration_users.txt | 224 ++++++
core/doc/admin/_sources/configuration/index.txt | 3 +-
core/doc/admin/_sources/index.txt | 3 +-
.../_sources/installation/installation_source.txt | 38 +-
core/doc/admin/_sources/maintenance/backup.txt | 2 +-
core/doc/admin/_sources/maintenance/update.txt | 8 +-
core/doc/admin/configuration/auth_ldap.html | 5 +-
core/doc/admin/configuration/background_jobs.html | 3 +-
.../configuration/configuration_3rdparty.html | 5 +-
.../admin/configuration/configuration_apps.html | 29 +-
.../configuration/configuration_automation.html | 5 +-
.../configuration_custom_clients.html | 3 +-
.../configuration/configuration_database.html | 3 +-
.../configuration/configuration_encryption.html | 3 +-
.../configuration/configuration_knowledgebase.html | 3 +-
.../configuration/configuration_language.html | 3 +-
.../admin/configuration/configuration_logging.html | 3 +-
.../admin/configuration/configuration_mail.html | 3 +-
.../configuration/configuration_maintenance.html | 3 +-
.../admin/configuration/configuration_preview.html | 3 +-
.../configuration/configuration_reverseproxy.html | 3 +-
.../admin/configuration/configuration_users.html | 378 ++++++++++
.../configuration/configuring_big_file_upload.html | 3 +-
.../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 | 8 +-
core/doc/admin/configuration/xsendfile.html | 3 +-
core/doc/admin/contents.html | 15 +-
core/doc/admin/index.html | 3 +-
.../admin/installation/installation_source.html | 40 +-
core/doc/admin/maintenance/backup.html | 6 +-
core/doc/admin/maintenance/index.html | 6 +-
core/doc/admin/maintenance/migrating.html | 2 +-
core/doc/admin/maintenance/restore.html | 2 +-
core/doc/admin/maintenance/update.html | 19 +-
core/doc/user/_images/bookmark_addurl.jpg | Bin 11368 -> 0 bytes
core/doc/user/_images/bookmark_addurl.png | Bin 0 -> 9464 bytes
core/doc/user/_images/bookmark_setting.jpg | Bin 6410 -> 0 bytes
core/doc/user/_images/bookmark_setting.png | Bin 0 -> 8861 bytes
core/doc/user/_images/calendar_createevent.png | Bin 21501 -> 17972 bytes
core/doc/user/_images/calendar_export.png | Bin 25552 -> 18885 bytes
core/doc/user/_images/calendar_import.png | Bin 8445 -> 8250 bytes
.../doc/user/_images/calendar_manage-calendars.png | Bin 32895 -> 39313 bytes
core/doc/user/_images/contact_bottombar.jpg | Bin 2233 -> 0 bytes
core/doc/user/_images/contact_bottombar.png | Bin 0 -> 890 bytes
core/doc/user/_images/contact_del_ab.jpg | Bin 28610 -> 0 bytes
core/doc/user/_images/contact_del_ab.png | Bin 0 -> 10105 bytes
core/doc/user/_images/contact_emptycontact.jpg | Bin 10690 -> 0 bytes
core/doc/user/_images/contact_emptycontact.png | Bin 0 -> 19910 bytes
core/doc/user/_images/contact_import.jpg | Bin 20281 -> 0 bytes
core/doc/user/_images/contact_uploadbutton.png | Bin 0 -> 4305 bytes
core/doc/user/_images/files_versioning.png | Bin 0 -> 9333 bytes
core/doc/user/_images/oc_connect.png | Bin 50629 -> 107250 bytes
core/doc/user/_images/oc_documents.png | Bin 0 -> 33956 bytes
core/doc/user/_images/oc_documents_col_edit.png | Bin 0 -> 15944 bytes
core/doc/user/_images/oc_documents_edit.png | Bin 0 -> 24685 bytes
core/doc/user/_images/oc_documents_share.png | Bin 0 -> 15529 bytes
core/doc/user/_images/oc_files_share.png | Bin 0 -> 11553 bytes
core/doc/user/_images/oc_filesweb.png | Bin 0 -> 28666 bytes
core/doc/user/_images/oc_filesweb_navigate.png | Bin 0 -> 5159 bytes
core/doc/user/_images/oc_filesweb_new.png | Bin 0 -> 5434 bytes
core/doc/user/_images/oc_ui.png | Bin 134914 -> 138786 bytes
core/doc/user/_images/oc_user_preferences.png | Bin 0 -> 24304 bytes
core/doc/user/_sources/bookmarks.txt | 44 +-
core/doc/user/_sources/contents.txt | 2 +
core/doc/user/_sources/documents.txt | 68 ++
.../_sources/files/configuring_big_file_upload.txt | 2 +-
core/doc/user/_sources/files/deletedfiles.txt | 17 +-
core/doc/user/_sources/files/encryption.txt | 2 +-
core/doc/user/_sources/files/files.txt | 64 +-
core/doc/user/_sources/files/filesweb.txt | 85 +++
core/doc/user/_sources/files/index.txt | 1 +
core/doc/user/_sources/files/sync.txt | 4 +-
core/doc/user/_sources/files/versioncontrol.txt | 22 +-
core/doc/user/_sources/index.txt | 15 +-
core/doc/user/_sources/migration.txt | 4 +-
core/doc/user/_sources/pim/calendar.txt | 20 +-
core/doc/user/_sources/pim/contacts.txt | 65 +-
core/doc/user/_sources/pim/sync_osx.txt | 16 +-
core/doc/user/_sources/pim/sync_thunderbird.txt | 18 +-
core/doc/user/_sources/userpreferences.txt | 31 +
core/doc/user/_sources/webinterface.txt | 24 +-
core/doc/user/bookmarks.html | 50 +-
core/doc/user/contents.html | 40 +-
core/doc/user/documents.html | 216 ++++++
core/doc/user/external_storage/google_drive.html | 4 +-
.../user/files/configuring_big_file_upload.html | 11 +-
core/doc/user/files/deletedfiles.html | 25 +-
core/doc/user/files/encryption.html | 11 +-
core/doc/user/files/files.html | 67 +-
core/doc/user/files/filesweb.html | 244 +++++++
core/doc/user/files/index.html | 14 +-
core/doc/user/files/quota.html | 7 +-
core/doc/user/files/sync.html | 15 +-
core/doc/user/files/versioncontrol.html | 30 +-
core/doc/user/genindex.html | 2 +
core/doc/user/index.html | 25 +-
core/doc/user/migration.html | 8 +-
core/doc/user/objects.inv | 4 +-
core/doc/user/pim/calendar.html | 31 +-
core/doc/user/pim/contacts.html | 72 +-
core/doc/user/pim/index.html | 6 +-
core/doc/user/pim/sync_ios.html | 4 +-
core/doc/user/pim/sync_kde.html | 6 +-
core/doc/user/pim/sync_osx.html | 22 +-
core/doc/user/pim/sync_thunderbird.html | 26 +-
core/doc/user/pim/troubleshooting.html | 4 +-
core/doc/user/search.html | 2 +
.../user/{migration.html => userpreferences.html} | 55 +-
core/doc/user/webinterface.html | 29 +-
core/js/js.js | 20 +-
core/js/share.js | 10 +-
core/l10n/ru_RU.php | 21 -
core/register_command.php | 1 +
core/skeleton/ownCloudUserManual.pdf | Bin 1393287 -> 1558533 bytes
core/templates/installation.php | 2 +-
l10n/ru_RU/core.po | 773 ---------------------
l10n/ru_RU/files.po | 411 -----------
l10n/ru_RU/files_encryption.po | 201 ------
l10n/ru_RU/files_external.po | 123 ----
l10n/ru_RU/files_sharing.po | 84 ---
l10n/ru_RU/files_trashbin.po | 60 --
l10n/ru_RU/files_versions.po | 43 --
l10n/ru_RU/lib.po | 341 ---------
l10n/ru_RU/settings.po | 657 -----------------
l10n/ru_RU/user_ldap.po | 515 --------------
l10n/ru_RU/user_webdavauth.po | 36 -
lib/base.php | 4 +-
lib/l10n/ru_RU.php | 12 -
lib/private/allconfig.php | 24 +-
lib/private/api.php | 42 +-
lib/private/connector/sabre/file.php | 7 +-
lib/private/db/mdb2schemareader.php | 8 +
lib/private/files.php | 7 +-
lib/private/files/cache/cache.php | 22 +-
lib/private/files/cache/homecache.php | 2 +-
lib/private/files/cache/scanner.php | 2 +-
lib/private/files/storage/local.php | 2 +-
lib/private/files/view.php | 13 +
lib/private/helper.php | 6 +-
lib/private/memcache/apcu.php | 2 +-
lib/private/memcache/xcache.php | 36 +-
lib/private/mimetypes.list.php | 3 +-
lib/private/preview/movies.php | 2 +-
lib/private/preview/office.php | 2 +-
lib/private/request.php | 23 +
lib/private/response.php | 14 +
lib/private/server.php | 12 +-
lib/private/session/internal.php | 13 +-
lib/private/session/memory.php | 2 +-
lib/private/setup.php | 3 +
lib/private/tags.php | 2 +-
lib/private/template.php | 3 +-
lib/private/user.php | 2 +
lib/private/user/backend.php | 17 +-
lib/private/user/database.php | 139 ++--
lib/private/user/dummy.php | 9 +
lib/private/user/manager.php | 39 +-
lib/private/user/session.php | 14 +-
lib/private/user/user.php | 50 +-
lib/private/util.php | 8 +-
lib/public/iconfig.php | 15 +-
lib/public/response.php | 9 +
lib/public/share.php | 10 +-
lib/public/util.php | 3 +-
settings/js/users.js | 2 +-
settings/l10n/ru_RU.php | 10 -
version.php | 8 +-
256 files changed, 3389 insertions(+), 4489 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