[Pkg-owncloud-commits] [owncloud] 116/121: Merge tag 'upstream/7.0.2_rc1+dfsg'
David Prévot
taffit at moszumanska.debian.org
Thu Aug 21 16:44:43 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 4f6cdb860b44098d3f60e726b657f04d1ce1de08
Merge: e9dcebf e0c49d6
Author: David Prévot <taffit at debian.org>
Date: Thu Aug 21 10:40:16 2014 -0400
Merge tag 'upstream/7.0.2_rc1+dfsg'
Upstream version 7.0.2~rc1+dfsg
# gpg: Signature faite le jeu. 21 août 2014 10:39:50 AST
# gpg: avec la clef RSA B82A217AFDFE09F2
# 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
apps/activity/l10n/ast.php | 1 +
apps/activity/l10n/az.php | 46 +++-
apps/activity/l10n/bg_BG.php | 1 +
apps/activity/l10n/bn_BD.php | 47 +++-
apps/activity/l10n/bn_IN.php | 1 +
apps/activity/l10n/cs_CZ.php | 3 +-
apps/activity/l10n/da.php | 1 +
apps/activity/l10n/de.php | 1 +
apps/activity/l10n/de_DE.php | 1 +
apps/activity/l10n/el.php | 1 +
apps/activity/l10n/en_GB.php | 1 +
apps/activity/l10n/es.php | 1 +
apps/activity/l10n/es_AR.php | 28 ++-
apps/activity/l10n/es_CL.php | 38 +++-
apps/activity/l10n/eu.php | 1 +
apps/activity/l10n/fa.php | 51 ++++-
apps/activity/l10n/fr.php | 1 +
apps/activity/l10n/gl.php | 1 +
apps/activity/l10n/hu_HU.php | 24 +-
apps/activity/l10n/{az.php => io.php} | 0
apps/activity/l10n/it.php | 1 +
apps/activity/l10n/ja.php | 9 +-
apps/activity/l10n/ja_JP.php | 8 -
apps/activity/l10n/ko.php | 6 +
apps/activity/l10n/l10n.pl | 169 --------------
apps/activity/l10n/nb_NO.php | 1 +
apps/activity/l10n/nl.php | 1 +
apps/activity/l10n/pl.php | 9 +-
apps/activity/l10n/pt_BR.php | 1 +
apps/activity/l10n/pt_PT.php | 1 +
apps/activity/l10n/ro.php | 5 +
apps/activity/l10n/ru.php | 9 +-
apps/activity/l10n/sk_SK.php | 6 +
apps/activity/l10n/sl.php | 1 +
apps/activity/l10n/tr.php | 1 +
apps/activity/lib/datahelper.php | 2 +
apps/activity/lib/hooks.php | 6 +-
apps/activity/templates/email.notification.php | 4 +-
apps/admin_dependencies_chk/css/style.css | 32 ++-
apps/admin_dependencies_chk/settings.php | 10 +-
apps/admin_dependencies_chk/templates/settings.php | 6 +-
apps/bookmarks/img/bookmarks.png | Bin 808 -> 503 bytes
apps/bookmarks/img/bookmarks.svg | 246 +--------------------
apps/bookmarks/lib/search.php | 2 +-
apps/calendar/export.php | 6 +-
apps/calendar/lib/calendar.php | 4 +-
apps/calendar/lib/object.php | 2 +-
apps/calendar/lib/sabre/backend.php | 30 ++-
apps/calendar/templates/calendar.php | 4 +-
apps/contacts/lib/controller/importcontroller.php | 7 +-
apps/contacts/lib/dispatcher.php | 3 +-
apps/documents/ajax/documentController.php | 6 +-
apps/documents/ajax/otpoll.php | 8 +-
apps/documents/ajax/sessionController.php | 18 +-
apps/documents/ajax/userController.php | 14 +-
apps/documents/appinfo/app.php | 10 +-
apps/documents/appinfo/update.php | 2 +-
apps/documents/js/viewer/viewer.js | 9 +-
apps/documents/lib/db/member.php | 4 +-
apps/documents/lib/db/op.php | 8 +-
apps/documents/lib/db/session.php | 30 +--
apps/documents/lib/download.php | 4 +-
apps/documents/lib/download/range.php | 6 +-
apps/documents/lib/download/simple.php | 6 +-
apps/documents/lib/filter/office.php | 10 +-
apps/documents/lib/storage.php | 8 +-
apps/documents/public.php | 4 +-
apps/files/ajax/delete.php | 3 +-
apps/files/ajax/newfile.php | 23 ++
apps/files/ajax/upload.php | 4 +-
apps/files/css/files.css | 7 +-
apps/files/js/file-upload.js | 11 +-
apps/files/js/filelist.js | 7 +-
apps/files/lib/app.php | 18 +-
apps/files/tests/ajax_rename.php | 46 +++-
apps/files/tests/js/filelistSpec.js | 22 +-
.../ajax/changeRecoveryPassword.php | 11 +-
.../ajax/updatePrivateKeyPassword.php | 14 +-
apps/files_encryption/hooks/hooks.php | 38 ++--
apps/files_encryption/lib/crypt.php | 131 +++++++++--
apps/files_encryption/lib/exceptions.php | 9 +
apps/files_encryption/lib/helper.php | 40 +++-
apps/files_encryption/lib/keymanager.php | 37 +++-
apps/files_encryption/lib/session.php | 20 +-
apps/files_encryption/lib/stream.php | 91 ++++++--
apps/files_encryption/lib/util.php | 86 +++++--
.../templates/settings-personal.php | 5 +-
apps/files_encryption/tests/crypt.php | 203 ++++++++++-------
apps/files_encryption/tests/keymanager.php | 36 ++-
apps/files_encryption/tests/share.php | 6 +-
apps/files_encryption/tests/util.php | 49 +++-
apps/files_external/lib/amazons3.php | 5 +-
apps/files_sharing/appinfo/app.php | 62 +++---
apps/files_sharing/appinfo/update.php | 3 +
apps/files_sharing/css/public.css | 5 +-
apps/files_sharing/js/public.js | 1 +
apps/files_sharing/lib/api.php | 1 -
apps/files_sharing/lib/cache.php | 107 +++------
apps/files_sharing/lib/helper.php | 20 ++
apps/files_sharing/lib/share/file.php | 15 +-
apps/files_sharing/lib/sharedstorage.php | 4 +-
apps/files_sharing/public.php | 4 +
apps/files_sharing/templates/public.php | 5 +
apps/files_sharing/tests/cache.php | 78 ++++++-
.../tests/helper.php} | 35 ++-
apps/files_sharing/tests/share.php | 30 +++
apps/files_sharing/tests/sharedstorage.php | 8 +-
apps/files_sharing/tests/update.php | 5 +
apps/files_texteditor/ajax/savefile.php | 10 +-
apps/files_texteditor/js/editor.js | 9 +-
apps/files_versions/lib/versions.php | 4 +-
apps/files_versions/tests/versions.php | 34 +++
apps/gallery/css/styles.css | 29 ++-
apps/gallery/js/album.js | 77 ++++++-
apps/gallery/js/gallery.js | 4 +-
apps/gallery/js/slideshow.js | 7 +-
apps/gallery/templates/index.php | 1 -
apps/user_ldap/css/settings.css | 5 +
apps/user_ldap/lib/access.php | 12 +
apps/user_ldap/lib/ldap.php | 2 +-
apps/user_ldap/lib/user/iusertools.php | 2 +
apps/user_ldap/lib/user/manager.php | 3 +-
apps/user_ldap/lib/wizard.php | 30 ++-
apps/user_ldap/templates/part.wizard-server.php | 7 +
apps/user_ldap/tests/access.php | 57 +++++
apps/user_ldap/tests/user/manager.php | 47 ++++
apps/user_ldap/tests/user_ldap.php | 5 +
config/config.sample.php | 16 +-
core/ajax/share.php | 7 +-
core/ajax/update.php | 6 +
core/css/apps.css | 11 +-
core/css/mobile.css | 9 +
core/css/styles.css | 15 +-
core/doc/admin/_images/create_public_share.png | Bin 0 -> 24377 bytes
.../configuration/configuration_database.txt | 36 +++
.../configuration/configuration_encryption.txt | 11 +-
.../configuration/server_to_server_managing.txt | 76 +++++--
core/doc/admin/_sources/maintenance/backup.txt | 2 +-
core/doc/admin/_sources/maintenance/restore.txt | 2 +-
core/doc/admin/_sources/maintenance/update.txt | 2 +
core/doc/admin/configuration/auth_ldap.html | 4 +-
core/doc/admin/configuration/background_jobs.html | 4 +-
.../configuration/configuration_3rdparty.html | 2 +-
.../admin/configuration/configuration_apps.html | 2 +-
.../admin/configuration/configuration_assets.html | 2 +-
.../configuration/configuration_automation.html | 2 +-
.../configuration_custom_clients.html | 2 +-
.../configuration/configuration_database.html | 36 ++-
.../configuration/configuration_encryption.html | 15 +-
.../configuration/configuration_knowledgebase.html | 2 +-
.../configuration/configuration_language.html | 2 +-
.../admin/configuration/configuration_logging.html | 2 +-
.../admin/configuration/configuration_mail.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 | 4 +-
.../configuration/server_to_server_managing.html | 86 ++++---
core/doc/admin/configuration/xsendfile.html | 2 +-
core/doc/admin/contents.html | 5 +-
core/doc/admin/index.html | 2 +-
core/doc/admin/maintenance/backup.html | 2 +-
core/doc/admin/maintenance/restore.html | 2 +-
core/doc/admin/maintenance/update.html | 7 +-
core/doc/user/_images/calendar_export.png | Bin 18885 -> 9835 bytes
core/doc/user/_images/calendar_import.png | Bin 8250 -> 9074 bytes
core/doc/user/_images/calendar_newtimezone1.png | Bin 5253 -> 4868 bytes
core/doc/user/_images/contact_crop.jpg | Bin 50676 -> 22353 bytes
core/doc/user/_images/files_versioning.png | Bin 9333 -> 8557 bytes
core/doc/user/_images/oc_connect.png | Bin 107250 -> 63833 bytes
core/doc/user/_images/oc_filesweb.png | Bin 28666 -> 17316 bytes
core/doc/user/_images/oc_main_web.png | Bin 115762 -> 41092 bytes
core/doc/user/_images/oc_main_web_labelled.png | Bin 150798 -> 75961 bytes
.../_images/oc_personal_settings_dropdown1.png | Bin 0 -> 14895 bytes
.../user/_images/oc_personal_settings_window.png | Bin 119355 -> 42959 bytes
core/doc/user/_images/oc_user_preferences.png | Bin 24304 -> 0 bytes
core/doc/user/_images/share_link_adding.png | Bin 32097 -> 18257 bytes
core/doc/user/_sources/files/encryption.txt | 14 +-
.../user/_sources/files/server_to_server_using.txt | 2 +-
core/doc/user/_sources/pim/sync_thunderbird.txt | 3 +-
core/doc/user/_sources/userpreferences.txt | 2 +-
core/doc/user/files/encryption.html | 14 +-
core/doc/user/files/server_to_server_using.html | 2 +-
core/doc/user/pim/sync_thunderbird.html | 3 +-
core/doc/user/userpreferences.html | 2 +-
core/doc/user/webinterface.html | 6 +-
core/js/config.php | 1 +
core/js/oc-dialogs.js | 4 +-
core/js/share.js | 29 +--
core/js/tests/specHelper.js | 24 ++
core/js/tests/specs/shareSpec.js | 55 ++++-
core/templates/login.php | 8 -
core/templates/update.admin.php | 4 +
index.php | 6 +
lib/base.php | 45 ++--
lib/private/app.php | 55 ++---
lib/private/appframework/routing/routeconfig.php | 14 +-
lib/private/connector/sabre/server.php | 22 ++
lib/private/defaults.php | 54 +++--
lib/private/files/cache/updater.php | 15 +-
lib/private/files/fileinfo.php | 2 +-
lib/private/files/node/folder.php | 41 ++--
lib/private/files/node/root.php | 28 +--
lib/private/files/view.php | 11 +
lib/private/group.php | 29 +--
lib/private/group/database.php | 2 +-
lib/private/group/group.php | 4 +-
lib/private/group/manager.php | 5 +-
lib/private/installer.php | 4 -
lib/private/memcache/factory.php | 5 +-
lib/private/needsupdateexception.php | 12 +
lib/private/ocsclient.php | 18 +-
lib/private/preview/txt.php | 9 +-
lib/private/server.php | 76 ++++---
lib/private/serviceunavailableexception.php | 12 +
lib/private/share/mailnotifications.php | 15 +-
lib/private/share/share.php | 12 +-
lib/private/updater.php | 77 +++++--
lib/private/user.php | 2 +-
lib/private/user/manager.php | 5 +
lib/private/user/session.php | 2 +-
lib/private/util.php | 18 +-
lib/public/defaults.php | 16 ++
lib/public/igroup.php | 81 +++++++
lib/public/igroupmanager.php | 83 +++++++
lib/public/iservercontainer.php | 7 +
lib/public/share.php | 14 +-
lib/repair/innodb.php | 2 +-
public.php | 5 +
remote.php | 4 +
settings/admin.php | 15 +-
settings/ajax/updateapp.php | 3 +
settings/ajax/userlist.php | 6 +-
settings/changepassword/controller.php | 6 +-
settings/js/apps.js | 2 +-
settings/l10n/nl.php | 2 +-
settings/personal.php | 6 +-
settings/templates/admin.php | 19 +-
version.php | 8 +-
243 files changed, 2712 insertions(+), 1372 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