[Pkg-owncloud-commits] [owncloud] 35/50: Merge branch 'stable6' into backport-11211-stable6

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit 716613fda4493770fe77510ef182dd0511643200
Merge: 77a4b16 f262914
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Tue Sep 23 14:49:53 2014 +0200

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

 apps/files_encryption/hooks/hooks.php | 15 +++++++++------
 config/config.sample.php              |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --cc config/config.sample.php
index dfb7a22,f32a956..fda536f
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@@ -242,28 -242,7 +242,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