[Pkg-owncloud-commits] [owncloud] 153/205: Merge pull request #17163 from owncloud/update-licenses
David Prévot
taffit at moszumanska.debian.org
Thu Jul 2 17:37:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit d1f0ff372e8c05ced760d4e21060e8d8db9c1963
Merge: 708c626 0032cdd
Author: Lukas Reschke <lukas at owncloud.com>
Date: Sat Jun 27 20:22:23 2015 +0200
Merge pull request #17163 from owncloud/update-licenses
Update license headers
.mailmap | 1 +
apps/encryption/appinfo/application.php | 3 ++-
apps/encryption/appinfo/register_command.php | 22 +++++++++++++----
apps/encryption/appinfo/routes.php | 2 ++
apps/encryption/command/migratekeys.php | 22 +++++++++++++----
apps/encryption/controller/recoverycontroller.php | 2 ++
apps/encryption/controller/settingscontroller.php | 2 ++
apps/encryption/controller/statuscontroller.php | 2 ++
apps/encryption/hooks/contracts/ihook.php | 2 ++
apps/encryption/lib/crypto/crypt.php | 2 ++
apps/encryption/lib/crypto/encryption.php | 5 +++-
apps/encryption/lib/hookmanager.php | 2 ++
apps/encryption/lib/migration.php | 25 ++++++++++---------
apps/encryption/lib/recovery.php | 2 ++
apps/encryption/lib/session.php | 2 ++
apps/encryption/lib/users/setup.php | 2 ++
apps/encryption/lib/util.php | 2 ++
.../tests/controller/RecoveryControllerTest.php | 16 ++++++++++++-
.../tests/controller/SettingsControllerTest.php | 2 ++
apps/encryption/tests/hooks/UserHooksTest.php | 17 ++++++++++++-
apps/encryption/tests/lib/HookManagerTest.php | 3 +++
apps/encryption/tests/lib/KeyManagerTest.php | 2 ++
apps/encryption/tests/lib/MigrationTest.php | 28 +++++++++++-----------
apps/encryption/tests/lib/RecoveryTest.php | 4 ++++
apps/encryption/tests/lib/UtilTest.php | 3 +++
apps/encryption/tests/lib/crypto/cryptTest.php | 2 ++
.../encryption/tests/lib/crypto/encryptionTest.php | 3 +++
apps/encryption/tests/lib/users/SetupTest.php | 2 ++
apps/files/ajax/delete.php | 2 --
apps/files/ajax/getstoragestats.php | 1 -
apps/files/ajax/move.php | 1 -
apps/files/ajax/newfile.php | 1 -
apps/files/ajax/newfolder.php | 1 -
apps/files/ajax/rename.php | 1 +
apps/files/ajax/upload.php | 1 -
apps/files/appinfo/app.php | 1 -
apps/files/appinfo/routes.php | 1 +
apps/files/download.php | 1 +
apps/files/index.php | 1 -
apps/files/tests/activitytest.php | 23 ++++++++++++++----
apps/files/tests/controller/apicontrollertest.php | 1 +
apps/files/tests/service/tagservice.php | 1 -
apps/files_external/ajax/applicable.php | 1 -
apps/files_external/ajax/dropbox.php | 1 -
apps/files_external/appinfo/app.php | 1 -
apps/files_external/appinfo/routes.php | 1 +
apps/files_external/lib/google.php | 1 +
apps/files_external/lib/sftp_key.php | 1 +
apps/files_external/lib/smb_oc.php | 1 -
apps/files_external/list.php | 1 -
apps/files_external/personal.php | 1 +
.../service/globalstoragesservice.php | 2 ++
apps/files_external/service/storagesservice.php | 2 ++
apps/files_external/settings.php | 1 +
apps/files_external/tests/backends/sftp.php | 1 +
apps/files_external/tests/config.php | 1 -
apps/files_sharing/ajax/shareinfo.php | 1 +
apps/files_sharing/api/local.php | 1 -
apps/files_sharing/appinfo/app.php | 2 --
apps/files_sharing/appinfo/application.php | 22 +++++++++++++----
apps/files_sharing/appinfo/routes.php | 2 ++
apps/files_sharing/appinfo/update.php | 1 -
.../lib/controllers/externalsharescontroller.php | 1 +
apps/files_sharing/lib/hooks.php | 1 +
apps/files_sharing/lib/mountprovider.php | 22 +++++++++++++----
.../lib/propagation/changewatcher.php | 22 +++++++++++++----
.../lib/propagation/propagationmanager.php | 22 +++++++++++++----
.../lib/propagation/recipientpropagator.php | 22 +++++++++++++----
apps/files_sharing/lib/sharedstorage.php | 1 +
apps/files_sharing/list.php | 1 -
apps/files_sharing/publicwebdav.php | 3 +--
apps/files_sharing/settings-personal.php | 1 +
.../tests/controller/sharecontroller.php | 1 +
.../tests/deleteorphanedsharesjobtest.php | 1 -
apps/files_sharing/tests/etagpropagation.php | 2 ++
.../tests/middleware/sharingcheckmiddleware.php | 1 +
apps/files_sharing/tests/permissions.php | 1 +
apps/files_sharing/tests/sharedmount.php | 1 +
apps/files_sharing/tests/sizepropagation.php | 3 ++-
apps/files_sharing/tests/unsharechildren.php | 2 +-
apps/files_sharing/tests/updater.php | 1 -
apps/files_sharing/tests/watcher.php | 1 +
apps/files_trashbin/ajax/delete.php | 1 -
apps/files_trashbin/ajax/list.php | 1 -
apps/files_trashbin/ajax/preview.php | 1 -
apps/files_trashbin/ajax/undelete.php | 1 -
apps/files_trashbin/appinfo/routes.php | 1 +
apps/files_trashbin/appinfo/update.php | 1 -
apps/files_trashbin/command/expire.php | 3 +++
apps/files_trashbin/lib/helper.php | 1 -
apps/files_trashbin/lib/trashbin.php | 2 +-
apps/files_trashbin/list.php | 1 -
apps/files_trashbin/tests/trashbin.php | 1 +
apps/files_versions/ajax/preview.php | 1 -
apps/files_versions/ajax/rollbackVersion.php | 1 -
apps/files_versions/appinfo/app.php | 1 -
apps/files_versions/appinfo/routes.php | 1 +
apps/files_versions/appinfo/update.php | 1 -
apps/files_versions/command/expire.php | 23 ++++++++++++++----
apps/files_versions/download.php | 1 +
apps/files_versions/lib/storage.php | 1 +
apps/files_versions/tests/versions.php | 2 ++
apps/provisioning_api/appinfo/app.php | 1 -
apps/provisioning_api/appinfo/routes.php | 1 +
apps/provisioning_api/lib/apps.php | 1 +
apps/provisioning_api/lib/groups.php | 1 +
apps/provisioning_api/lib/users.php | 3 +++
apps/provisioning_api/tests/appstest.php | 1 +
apps/provisioning_api/tests/groupstest.php | 1 +
apps/provisioning_api/tests/userstest.php | 3 +++
apps/user_ldap/ajax/getNewServerConfigPrefix.php | 1 -
apps/user_ldap/appinfo/install.php | 1 -
apps/user_ldap/lib/connection.php | 1 -
apps/user_ldap/lib/proxy.php | 1 -
apps/user_ldap/lib/user/manager.php | 1 +
apps/user_ldap/settings.php | 1 -
apps/user_ldap/tests/user_ldap.php | 1 +
apps/user_webdavauth/appinfo/app.php | 1 +
apps/user_webdavauth/user_webdavauth.php | 2 +-
build/license.php | 2 +-
console.php | 3 ++-
core/ajax/preview.php | 1 -
core/ajax/share.php | 3 ++-
core/ajax/update.php | 1 +
core/application.php | 1 +
core/avatar/avatarcontroller.php | 2 ++
core/command/app/checkcode.php | 1 +
core/command/check.php | 22 ++++++++++++++++-
core/command/maintenance/install.php | 2 ++
core/command/status.php | 1 +
core/command/upgrade.php | 1 +
core/command/user/add.php | 2 ++
core/command/user/delete.php | 2 ++
core/command/user/lastseen.php | 1 +
core/command/user/report.php | 1 +
core/command/user/resetpassword.php | 3 +++
core/register_command.php | 1 +
core/routes.php | 1 -
core/strings.php | 1 -
lib/base.php | 2 +-
lib/private/activitymanager.php | 1 -
lib/private/api.php | 1 +
lib/private/app/appmanager.php | 2 ++
lib/private/app/codechecker.php | 1 +
lib/private/app/platformrepository.php | 1 -
lib/private/appconfig.php | 1 +
lib/private/appframework/app.php | 1 +
lib/private/appframework/http/request.php | 1 +
.../utility/controllermethodreflector.php | 2 +-
.../appframework/utility/simplecontainer.php | 1 +
lib/private/apphelper.php | 1 +
lib/private/avatar.php | 2 +-
lib/private/avatarmanager.php | 2 ++
lib/private/cache/file.php | 10 +-------
.../connector/sabre/copyetagheaderplugin.php | 21 ++++++++++++----
.../connector/sabre/custompropertiesbackend.php | 2 ++
lib/private/connector/sabre/directory.php | 1 +
lib/private/connector/sabre/file.php | 3 ---
lib/private/connector/sabre/filesplugin.php | 2 ++
lib/private/connector/sabre/maintenanceplugin.php | 1 +
lib/private/connector/sabre/tagsplugin.php | 1 -
lib/private/console/application.php | 21 +++++++++++++++-
lib/private/db/migrator.php | 1 +
lib/private/db/ocsqliteplatform.php | 22 +++++++++++++----
lib/private/encryption/hookmanager.php | 2 ++
lib/private/encryption/keys/storage.php | 2 ++
lib/private/encryption/manager.php | 3 +++
lib/private/encryption/update.php | 2 ++
lib/private/encryption/util.php | 3 +++
lib/private/files.php | 5 ++--
lib/private/files/cache/cache.php | 1 +
lib/private/files/filesystem.php | 3 +--
lib/private/files/mapper.php | 1 -
lib/private/files/objectstore/noopscanner.php | 1 +
lib/private/files/storage/dav.php | 1 -
lib/private/files/storage/local.php | 1 +
lib/private/files/storage/localtempfiletrait.php | 2 ++
lib/private/files/storage/mappedlocal.php | 1 +
lib/private/files/storage/storage.php | 1 +
lib/private/files/storage/storagefactory.php | 1 -
lib/private/files/storage/wrapper/encryption.php | 3 +++
lib/private/files/stream/encryption.php | 4 +++-
lib/private/group/manager.php | 3 +++
lib/private/group/metadata.php | 1 +
lib/private/helper.php | 2 +-
lib/private/hooks/emittertrait.php | 1 -
lib/private/l10n/string.php | 1 +
lib/private/legacy/appconfig.php | 1 +
lib/private/lock/memcachelockingprovider.php | 2 ++
lib/private/lock/nooplockingprovider.php | 2 ++
lib/private/log.php | 1 -
lib/private/log/errorhandler.php | 1 +
lib/private/log/owncloud.php | 7 ------
lib/private/log/syslog.php | 1 -
lib/private/memcache/arraycache.php | 1 +
lib/private/memcache/factory.php | 2 ++
lib/private/memcache/nullcache.php | 3 +++
lib/private/memcache/redis.php | 2 ++
lib/private/mimetypes.list.php | 2 ++
lib/private/ocsclient.php | 2 +-
lib/private/preview.php | 3 +--
lib/private/preview/bitmap.php | 2 +-
lib/private/preview/bmp.php | 3 ++-
lib/private/preview/gif.php | 3 ++-
lib/private/preview/image.php | 2 +-
lib/private/preview/jpeg.php | 3 ++-
lib/private/preview/markdown.php | 1 -
lib/private/preview/movie.php | 2 +-
lib/private/preview/mp3.php | 2 +-
lib/private/preview/msoffice2003.php | 1 -
lib/private/preview/msoffice2007.php | 1 -
lib/private/preview/msofficedoc.php | 1 -
lib/private/preview/office.php | 1 +
lib/private/preview/opendocument.php | 1 -
lib/private/preview/png.php | 3 ++-
lib/private/preview/provider.php | 2 ++
lib/private/preview/staroffice.php | 1 -
lib/private/preview/svg.php | 2 +-
lib/private/preview/txt.php | 2 --
lib/private/preview/xbitmap.php | 3 ++-
lib/private/previewmanager.php | 1 +
lib/private/repair.php | 1 +
lib/private/repairstep.php | 1 -
lib/private/response.php | 1 +
lib/private/route/route.php | 1 +
lib/private/server.php | 1 +
lib/private/servernotavailableexception.php | 2 +-
lib/private/setup.php | 1 -
lib/private/setup/abstractdatabase.php | 1 -
lib/private/setup/mysql.php | 1 -
lib/private/setup/oci.php | 1 -
lib/private/setup/postgresql.php | 1 -
lib/private/setup/sqlite.php | 1 -
lib/private/share/helper.php | 1 +
lib/private/share/mailnotifications.php | 2 +-
lib/private/template/resourcenotfoundexception.php | 1 +
lib/private/templatelayout.php | 1 +
lib/private/tempmanager.php | 3 ++-
lib/private/updater.php | 1 +
lib/private/user.php | 1 +
lib/private/user/database.php | 1 +
lib/private/user/nouserexception.php | 21 ++++++++++++----
lib/private/util.php | 2 +-
lib/public/api.php | 1 +
lib/public/app/iappmanager.php | 1 +
.../appframework/http/datadisplayresponse.php | 1 +
lib/public/appframework/http/icallbackresponse.php | 1 +
lib/public/appframework/http/ioutput.php | 1 +
lib/public/appframework/http/notfoundresponse.php | 1 +
lib/public/appframework/http/streamresponse.php | 1 +
lib/public/appframework/iapi.php | 1 -
lib/public/command/ibus.php | 1 +
lib/public/command/icommand.php | 1 +
.../exceptions/genericencryptionexception.php | 3 +++
lib/public/encryption/iencryptionmodule.php | 3 +++
lib/public/encryption/ifile.php | 1 +
lib/public/encryption/imanager.php | 3 +++
lib/public/encryption/keys/istorage.php | 2 ++
lib/public/files/filenametoolongexception.php | 1 +
.../files/invalidcharacterinpathexception.php | 1 +
lib/public/files/reservedwordexception.php | 1 +
lib/public/files/storage.php | 1 -
lib/public/http/client/iclient.php | 1 +
lib/public/http/client/iclientservice.php | 1 +
lib/public/http/client/iresponse.php | 1 +
lib/public/icertificatemanager.php | 1 +
lib/public/igroupmanager.php | 2 ++
lib/public/ihelper.php | 1 +
lib/public/iimage.php | 2 ++
lib/public/imemcache.php | 1 +
lib/public/iservercontainer.php | 1 +
lib/public/itags.php | 3 ---
lib/public/lock/ilockingprovider.php | 1 +
lib/public/lock/lockedexception.php | 2 ++
lib/public/mail/imailer.php | 1 +
lib/public/preview/iprovider.php | 1 +
lib/public/response.php | 2 ++
lib/public/share.php | 1 +
lib/public/template.php | 1 -
lib/public/user.php | 1 -
lib/repair/preview.php | 1 -
lib/repair/repairlegacystorages.php | 1 +
lib/repair/repairmimetypes.php | 2 ++
lib/repair/sqliteautoincrement.php | 22 +++++++++++++----
ocs/routes.php | 1 +
ocs/v1.php | 1 +
public.php | 1 +
remote.php | 1 -
settings/admin.php | 2 ++
settings/ajax/enableapp.php | 1 -
settings/ajax/navigationdetect.php | 1 -
settings/ajax/togglegroups.php | 1 -
settings/ajax/togglesubadmins.php | 1 -
settings/ajax/updateapp.php | 1 -
settings/application.php | 3 +++
settings/changepassword/controller.php | 2 +-
settings/controller/checksetupcontroller.php | 2 ++
settings/controller/groupscontroller.php | 1 +
settings/controller/logsettingscontroller.php | 1 +
settings/controller/userscontroller.php | 1 +
settings/personal.php | 1 +
settings/routes.php | 2 --
settings/users.php | 1 +
version.php | 1 -
304 files changed, 631 insertions(+), 228 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