[Pkg-owncloud-commits] [owncloud] 137/258: Merge branch 'stable7' into backport-11211

[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 734112a5c1ac813437966588615dc84bbddfcfc7
Merge: bb69eeb a6eb638
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Tue Sep 23 14:48:16 2014 +0200

    Merge branch 'stable7' into backport-11211
    
    Conflicts:
    	config/config.sample.php

 apps/files/ajax/newfile.php           |   8 +-
 apps/files_encryption/hooks/hooks.php |   9 +-
 config/config.sample.php              |   2 +-
 lib/base.php                          |  12 ++-
 lib/private/files/storage/dav.php     |   4 +
 lib/private/httphelper.php            | 177 ++++++++++++++++++++++++++++++++++
 lib/private/server.php                |  13 +++
 lib/private/user/http.php             |   2 +
 lib/private/util.php                  |  95 ++----------------
 lib/public/iservercontainer.php       |   5 +
 tests/lib/httphelper.php              |  88 +++++++++++++++++
 11 files changed, 316 insertions(+), 99 deletions(-)

diff --cc config/config.sample.php
index 0a933b1,75a9d64..c041f4e
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@@ -269,28 -269,7 +269,28 @@@ $CONFIG = array
  /* custom path for libreoffice / openoffice binary */
  'preview_libreoffice_path' => '/usr/bin/libreoffice',
  /* cl parameters for libreoffice / openoffice */
- 'preview_office_cl_parameters' => '',
+ 'preview_office_cl_parameters' => ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ',
 +/**
 + * Only register providers that have been explicitly enabled
 + *
 + * The following providers are enabled by default:
 + *  - OC\Preview\Image
 + *  - OC\Preview\MP3
 + *  - OC\Preview\TXT
 + *  - OC\Preview\MarkDown
 + *
 + * The following providers are disabled by default due to performance or privacy concerns:
 + *  - OC\Preview\Office
 + *  - OC\Preview\SVG
 + *  - OC\Preview\Movies
 + *  - OC\Preview\PDF
 + */
 +'enabledPreviewProviders' => array(
 +	'OC\Preview\Image',
 +	'OC\Preview\MP3',
 +	'OC\Preview\TXT',
 +	'OC\Preview\MarkDown'
 +),
  
  /* whether avatars should be enabled */
  'enable_avatars' => true,

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