[Pkg-owncloud-commits] [owncloud] 02/07: Merge tag 'upstream/5.0.11_rc2+dfsg'
David Prévot
taffit at alioth.debian.org
Wed Sep 4 22:07:13 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit df64fa1904de784032af251eff9360e452e038b3
Merge: 4c021ee 5493542
Author: David Prévot <taffit at debian.org>
Date: Wed Sep 4 13:39:13 2013 -0400
Merge tag 'upstream/5.0.11_rc2+dfsg'
Upstream version 5.0.11~rc2+dfsg
# gpg: Signature faite le mer. 04 sept. 2013 13:38:45 AST avec la clef RSA d'identifiant 44F6BD3C
# 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/calendar/js/calendar.js | 6 +-
apps/contacts/ajax/contact/saveproperty.php | 15 +-
apps/contacts/ajax/uploadimport.php | 88 -
apps/contacts/import.php | 178 --
apps/contacts/js/app.js | 35 +-
apps/contacts/js/contacts.js | 20 +-
apps/contacts/lib/controller/importcontroller.php | 9 +-
apps/external/appinfo/app.php | 2 +-
apps/files/ajax/upload.php | 25 +-
apps/files/index.php | 2 +-
apps/files/js/file-upload.js | 55 +-
apps/files/js/fileactions.js | 5 +-
apps/files/lib/helper.php | 2 +-
apps/files_encryption/files/error.php | 4 +-
apps/files_encryption/lib/util.php | 32 +-
.../3rdparty/google-api-php-client/LICENSE | 203 ++
.../3rdparty/google-api-php-client/NOTICE | 4 +
.../3rdparty/google-api-php-client/README | 40 +
.../google-api-php-client/src/Google_Client.php | 462 +++
.../src/auth/Google_AssertionCredentials.php | 104 +
.../google-api-php-client/src/auth/Google_Auth.php | 36 +
.../src/auth/Google_AuthNone.php | 48 +
.../src/auth/Google_LoginTicket.php | 63 +
.../src/auth/Google_OAuth2.php | 445 +++
.../src/auth/Google_P12Signer.php | 70 +
.../src/auth/Google_PemVerifier.php | 66 +
.../src/auth/Google_Signer.php | 30 +
.../src/auth/Google_Verifier.php | 31 +
.../src/cache/Google_ApcCache.php | 98 +
.../src/cache/Google_Cache.php | 55 +
.../src/cache/Google_FileCache.php | 137 +
.../src/cache/Google_MemcacheCache.php | 130 +
.../3rdparty/google-api-php-client/src/config.php | 81 +
.../src/contrib/Google_DriveService.php | 3143 ++++++++++++++++++++
.../src/external/URITemplateParser.php | 209 ++
.../src/io/Google_CacheParser.php | 173 ++
.../google-api-php-client/src/io/Google_CurlIO.php | 278 ++
.../src/io/Google_HttpRequest.php | 304 ++
.../google-api-php-client/src/io/Google_IO.php | 49 +
.../google-api-php-client/src/io/Google_REST.php | 128 +
.../google-api-php-client/src/io/cacerts.pem | 714 +++++
.../src/service/Google_BatchRequest.php | 110 +
.../src/service/Google_MediaFileUpload.php | 262 ++
.../src/service/Google_Model.php | 115 +
.../src/service/Google_Service.php | 22 +
.../src/service/Google_ServiceResource.php | 205 ++
.../src/service/Google_Utils.php | 117 +
apps/files_external/ajax/google.php | 86 +-
apps/files_external/js/google.js | 163 +-
apps/files_external/lib/config.php | 31 +-
apps/files_external/lib/google.php | 906 +++---
apps/files_external/lib/irods.php | 14 +-
apps/files_external/lib/smb.php | 12 +-
apps/files_external/tests/config.php | 11 +-
apps/files_external/tests/google.php | 18 +-
apps/files_sharing/js/share.js | 7 +-
apps/files_sharing/lib/sharedstorage.php | 6 +-
apps/files_sharing/public.php | 2 +-
apps/files_sharing/templates/authenticate.php | 3 +
apps/files_texteditor/appinfo/app.php | 13 +-
apps/files_trashbin/index.php | 30 +-
apps/files_versions/lib/versions.php | 49 +-
apps/tasks/appinfo/app.php | 2 +-
apps/user_ldap/lib/access.php | 2 +-
apps/user_ldap/lib/connection.php | 14 +-
apps/user_ldap/lib/jobs.php | 2 +-
apps/user_ldap/user_ldap.php | 10 +-
core/ajax/share.php | 15 +-
core/css/styles.css | 11 +
.../configuration/configuration_custom_clients.txt | 27 +
.../configuration/configuration_encryption.txt | 4 +-
.../configuration/configuration_language.txt | 39 +
.../configuration/configuration_logging.txt | 10 +
.../configuration/configuration_maintenance.txt | 21 +
.../_sources/installation/installation_others.txt | 4 +-
.../configuration_custom_clients.html} | 66 +-
.../configuration/configuration_encryption.html | 4 +-
.../configuration/configuration_language.html} | 82 +-
.../admin/configuration/configuration_logging.html | 6 +
.../configuration/configuration_maintenance.html} | 57 +-
.../admin/installation/installation_others.html | 4 +-
core/doc/admin/searchindex.js | 2 +-
core/doc/user/_sources/files/deletedfiles.txt | 20 +-
core/doc/user/files/deletedfiles.html | 20 +-
core/doc/user/searchindex.js | 2 +-
core/js/js.js | 3 +-
core/js/share.js | 6 +-
core/templates/login.php | 4 +-
lib/app.php | 16 +-
lib/archive.php | 5 +-
lib/base.php | 26 +-
lib/cache/file.php | 13 +-
lib/cache/fileglobal.php | 20 +-
lib/connector/sabre/directory.php | 6 +-
lib/connector/sabre/file.php | 7 +-
lib/connector/sabre/principal.php | 14 +-
lib/connector/sabre/quotaplugin.php | 91 +-
lib/files/cache/scanner.php | 35 +-
lib/files/storage/common.php | 25 +-
lib/files/storage/mappedlocal.php | 2 +-
lib/files/view.php | 8 +-
lib/helper.php | 23 +-
lib/installer.php | 10 +-
lib/l10n.php | 7 +-
lib/public/files.php | 10 +
lib/public/share.php | 16 +-
lib/util.php | 4 +-
settings/ajax/createuser.php | 2 +-
settings/css/settings.css | 4 +
settings/js/users.js | 28 +-
settings/personal.php | 2 +-
settings/templates/users.php | 6 +-
settings/users.php | 15 +-
113 files changed, 9298 insertions(+), 1295 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