[Pkg-owncloud-commits] [owncloud] 69/145: Merge branch 'stable6' into 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 5edc4c95bc686a702b37e5a2b93e0557d50b86ec
Merge: 379ddd8 f9bd4c5
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Feb 7 14:21:10 2014 +0100

    Merge branch 'stable6' into backport_6777_stable6
    
    Conflicts:
    	apps/files_sharing/css/public.css
    	apps/files_sharing/templates/public.php

 .htaccess                                     |   2 +-
 apps/files/css/upload.css                     |   8 -
 apps/files/templates/index.php                |   2 +-
 apps/files_encryption/hooks/hooks.php         |  64 ++++++
 apps/files_encryption/lib/helper.php          |   2 +
 apps/files_encryption/lib/keymanager.php      |  55 ++++--
 apps/files_encryption/lib/proxy.php           |  44 -----
 apps/files_encryption/lib/util.php            |   2 +-
 apps/files_encryption/tests/hooks.php         | 271 ++++++++++++++++++++++++++
 apps/files_encryption/tests/keymanager.php    |  20 ++
 apps/files_encryption/tests/proxy.php         |  50 -----
 apps/files_encryption/tests/share.php         |  44 +++--
 apps/files_sharing/css/authenticate.css       |   7 +-
 apps/files_sharing/css/public.css             |   2 +-
 apps/files_sharing/lib/cache.php              |  39 +++-
 apps/files_sharing/templates/authenticate.php |   2 +-
 apps/files_sharing/tests/cache.php            | 134 +++++++++++++
 config/config.sample.php                      |   7 +
 core/css/icons.css                            | 240 +++++++++++++++++++++++
 core/js/config.php                            |   6 +
 core/js/js.js                                 |  53 +++--
 lib/base.php                                  |   1 +
 lib/private/connector/sabre/objecttree.php    |  15 +-
 settings/templates/apps.php                   |   4 +
 24 files changed, 910 insertions(+), 164 deletions(-)

diff --cc apps/files/templates/index.php
index 5188ca5,5ed1ee0..ff78f0c
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@@ -29,10 -23,10 +29,10 @@@
  					<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
  					<input type="file" id="file_upload_start" name='files[]'
  						   data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
- 					<a href="#" class="svg"></a>
+ 					<a href="#" class="svg icon icon-upload"></a>
  			</div>
  			<?php if ($_['trash']): ?>
 -			<input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
 +			<input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?> />
  			<?php endif; ?>
  			<div id="uploadprogresswrapper">
  				<div id="uploadprogressbar"></div>

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