[Pkg-owncloud-commits] [owncloud] 74/145: Merge pull request #7083 from owncloud/backport_6777_stable6

[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 fb6290c87a9cfd43ca1332c6ef65ccbb29b073c6
Merge: 9c9b161 5edc4c9
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Feb 7 17:08:25 2014 +0100

    Merge pull request #7083 from owncloud/backport_6777_stable6
    
    Backport 6777 stable6

 apps/files/css/files.css                |  15 ++++--
 apps/files/js/fileactions.js            |   4 +-
 apps/files/js/files.js                  |   2 +-
 apps/files/templates/index.php          |  10 +++-
 apps/files_sharing/css/mobile.css       |  49 +++++++++++++++++++
 apps/files_sharing/css/public.css       |  67 +++++++++-----------------
 apps/files_sharing/js/public.js         |  24 ++-------
 apps/files_sharing/public.php           |   5 +-
 apps/files_sharing/templates/public.php |  83 +++++++++-----------------------
 core/img/actions/toggle-filelist.png    | Bin 0 -> 195 bytes
 core/img/actions/toggle-filelist.svg    |  11 +++++
 core/img/actions/toggle-pictures.png    | Bin 0 -> 193 bytes
 core/img/actions/toggle-pictures.svg    |   9 ++++
 core/templates/layout.base.php          |   2 +-
 core/templates/layout.guest.php         |   2 +-
 15 files changed, 144 insertions(+), 139 deletions(-)

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