[Pkg-owncloud-commits] [owncloud] 53/61: Merge branch 'stable7' of https://github.com/owncloud/core into stable7

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit c0f0e79b5e62e229cc3e3a0fa597239b5eebccaf
Merge: 727374a a0f024f
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Wed Jul 30 17:40:05 2014 -0400

    Merge branch 'stable7' of https://github.com/owncloud/core into stable7

 3rdparty                                           |   2 +-
 apps/files/css/files.css                           |  14 ++-
 apps/files/js/filelist.js                          |  28 ++++-
 apps/files/tests/js/filelistSpec.js                |  51 +++++---
 apps/files_encryption/hooks/hooks.php              |  54 ++++++--
 apps/files_encryption/lib/helper.php               |   4 +-
 apps/files_encryption/settings-admin.php           |   3 +
 apps/files_encryption/templates/settings-admin.php |   4 +
 .../templates/settings-personal.php                |   9 +-
 apps/files_encryption/tests/hooks.php              |  52 ++++++++
 apps/files_sharing/ajax/publicpreview.php          |   4 -
 apps/files_sharing/appinfo/update.php              |   6 +-
 apps/files_sharing/js/sharedfilelist.js            |   4 +-
 apps/files_sharing/lib/api.php                     |  29 ++++-
 apps/files_sharing/lib/external/storage.php        |   9 +-
 apps/files_sharing/templates/public.php            |   2 +-
 apps/files_sharing/tests/api.php                   |  74 ++++++++++-
 apps/files_sharing/tests/update.php                |   1 +
 apps/files_versions/appinfo/app.php                |   7 +-
 apps/files_versions/lib/hooks.php                  |  30 ++++-
 apps/files_versions/lib/versions.php               |  70 +++++++----
 apps/files_versions/tests/versions.php             | 108 ++++++++++++++++
 core/ajax/preview.php                              |   4 -
 core/ajax/share.php                                |  16 +--
 core/css/header.css                                |   2 +
 core/css/icons.css                                 |   3 +
 core/css/mobile.css                                |  16 ++-
 core/css/styles.css                                |  29 ++++-
 core/img/actions/public.png                        | Bin 338 -> 307 bytes
 core/img/actions/public.svg                        |   7 +-
 core/img/actions/search-white.png                  | Bin 0 -> 309 bytes
 core/img/actions/search-white.svg                  |   5 +
 core/img/filetypes/folder-public.png               | Bin 1308 -> 1251 bytes
 core/img/filetypes/folder-public.svg               |  41 +++---
 core/js/js.js                                      |  16 ++-
 core/js/share.js                                   |  28 ++++-
 core/js/tests/specs/coreSpec.js                    |   6 +
 core/js/tests/specs/shareSpec.js                   | 139 +++++++++++++++++++--
 core/lostpassword/controller/lostcontroller.php    |  25 +++-
 cron.php                                           |   5 +
 lib/base.php                                       |   9 ++
 lib/private/backgroundjob/joblist.php              |   5 +-
 lib/private/contacts/localaddressbook.php          | 104 +++++++++++++++
 lib/private/db/mdb2schemamanager.php               |   3 +-
 lib/private/db/migrator.php                        |   4 +-
 lib/private/db/mysqlmigrator.php                   |   4 +
 lib/private/db/sqlitemigrator.php                  |  39 +++++-
 lib/private/image.php                              |   8 ++
 lib/private/preview.php                            |  10 +-
 lib/private/preview/mp3.php                        |   2 -
 lib/private/server.php                             |   6 +-
 lib/private/share/share.php                        |  64 ++++++++--
 lib/private/updater.php                            |   5 +-
 lib/private/user/user.php                          |   2 +-
 lib/private/util.php                               |  24 +++-
 lib/public/appframework/http/templateresponse.php  |   4 +-
 lib/public/iuser.php                               |   6 +-
 lib/public/share.php                               |   5 +-
 lib/public/util.php                                |   9 ++
 settings/admin.php                                 |   8 +-
 settings/js/apps.js                                |   2 +-
 tests/lib/contacts/localadressbook.php             |  95 ++++++++++++++
 tests/lib/db/mysqlmigration.php                    |  39 ++++++
 tests/lib/db/sqlitemigration.php                   |  39 ++++++
 tests/lib/share/share.php                          | 107 ++++++++++++++--
 65 files changed, 1309 insertions(+), 201 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git