[Pkg-owncloud-commits] [owncloud] 23/69: Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master

[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 341fcdc37a74b630ef7d47b5f0b336622c072ddc
Merge: d2754af d163441
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon May 5 10:12:40 2014 +0200

    Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
    
    Images on public sharing get downscaled to increase use experience - thi...

 apps/files_sharing/ajax/publicpreview.php |   8 ++-
 apps/files_sharing/appinfo/routes.php     |   8 +--
 apps/files_sharing/js/public.js           | 106 +++++++++++++++++-------------
 apps/files_sharing/templates/public.php   |   1 -
 apps/files_trashbin/appinfo/routes.php    |   5 +-
 apps/files_versions/appinfo/routes.php    |   3 +-
 core/ajax/preview.php                     |   8 ++-
 core/routes.php                           |   2 +
 lib/private/preview.php                   |  60 +++++++++++------
 lib/private/preview/image.php             |   3 +-
 lib/private/preview/mp3.php               |   2 +-
 lib/private/preview/pdf.php               |   1 +
 lib/private/preview/provider.php          |   1 +
 lib/private/preview/svg.php               |   3 +-
 14 files changed, 135 insertions(+), 76 deletions(-)

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