Merge master into oc_preview

diff --cc 3rdparty
index bd366f82084718903c8a7b85fbc9ad0595d29c5a,21b466b72cdd4c823c011669593ecef1defb1f3c..dc87ea630287f27502eba825fbb19fcc33c34c86
--- 1/3rdparty
--- 2/3rdparty
+++ b/3rdparty
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit bd366f82084718903c8a7b85fbc9ad0595d29c5a
 -Subproject commit 21b466b72cdd4c823c011669593ecef1defb1f3c
++Subproject commit dc87ea630287f27502eba825fbb19fcc33c34c86

diff --cc apps/files/css/files.css
index b94d6fbcbe83b05f9fd6c58763d2779b8896d54f,a9b93dc2deefd87418b6ea1d51e2bde7c7342221..be2af2d1aa506162fc9b7c7d67bb92d582fc6e19
--- 1/apps/files/css/files.css
--- 2/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@@ -91,46 -85,16 +91,47 @@@ span.extension { text-transform:lowerca
  tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
  table tr.mouseOver td { background-color:#eee; }
  table th { height:2em; padding:0 .5em; color:#999; }
 -table th .name { float:left; margin-left:.5em; }
 +table th .name {
 +      position: absolute;
 +      left: 55px;
 +      top: 15px;
 +}
  table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
 -table td { border-bottom:1px solid #eee; font-style:normal; background-position:1em .5em; background-repeat:no-repeat; }
 -table th#headerName { width:100em; /* not really sure why this works better than 100% … table styling */ }
 -table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-align:right; }
 -table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
 +table td {
 +      border-bottom: 1px solid #eee;
 +      font-style: normal;
 +      background-position: 8px center;
 +      background-repeat: no-repeat;
 +}
 +table th#headerName {
 +      position: relative;
 +      width: 100em; /* not really sure why this works better than 100% … table styling */
 +      padding: 0;
 +}
 +#headerName-container {
 +      position: relative;
 +      height: 50px;
 +}
 +table th#headerSize, table td.filesize {
 +      min-width: 3em;
 +      padding: 0 1em;
 +      text-align: right;
 +}
 +table th#headerDate, table td.date {
 +      -moz-box-sizing: border-box;
 +      box-sizing: border-box;
 +      position: relative;
 +      min-width: 11em;
 +      display: block;
 +      height: 51px;
 +}
  
  /* Multiselect bar */
 -#filestable.multiselect { top:63px; }
 +#filestable.multiselect {
 +      top: 88px;
 +}
- table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; }
+ table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 80px; width:100%; }
++
  table.multiselect thead th {
        background-color: rgba(210,210,210,.7);
        color: #000;
@@@ -298,10 -170,24 +299,23 @@@ a.action>img { max-height:16px; max-wid
  }
  
  .summary {
-       opacity: .5;
+       -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+       filter: alpha(opacity=30);
+       opacity: .3;
+       height: 70px;
+ }
+ 
+ .summary:hover, .summary, table tr.summary td {
+       background-color: transparent;
+ }
+ 
+ .summary td {
+       padding-top: 8px;
+       padding-bottom: 8px;
+       border-bottom: none;
  }
 -
  .summary .info {
 -      margin-left: 3em;
 +      margin-left: 55px;
  }
  
  #scanning-message{ top:40%; left:40%; position:absolute; display:none; }

diff --cc apps/files/index.php
Simple merge

diff --cc apps/files/js/file-upload.js
Simple merge

diff --cc apps/files/js/filelist.js
Simple merge

diff --cc apps/files/templates/part.list.php
index c91dda4c77ed5b92f0c5ca3d91d450767907a762,3e6f619868de068416d79819c7853beba6fb3174..4076c1bb3313ed892905ba1088453b0ea0f21425
--- 1/apps/files/templates/part.list.php
--- 2/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@@ -1,16 -1,5 +1,7 @@@
  <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
- <?php $totalfiles = 0;
- $totaldirs = 0;
- $totalsize = 0; ?>
  <?php foreach($_['files'] as $file):
-       $totalsize += $file['size'];
-       if ($file['type'] === 'dir') {
-               $totaldirs++;
-       } else {
-               $totalfiles++;
-       }
 +      //strlen('files/') => 6
 +      $relativePath = substr($file['path'], 6);
        // the bigger the file, the darker the shade of grey; megabytes*2
        $simple_size_color = intval(160-$file['size']/(1024*1024)*2);
        if($simple_size_color<0) $simple_size_color = 0;

diff --cc apps/files_trashbin/lib/trash.php
Simple merge

diff --cc config/config.sample.php
index 6dd45163677235fe264912f30dbc6cad0d14de76,f5cb33732f840d038f6be31206225a0d59aba4fd..5f748438bc7ab605623ad85c70a171255a48b437
--- 1/config/config.sample.php
--- 2/config/config.sample.php
+++ b/config/config.sample.php
@@@ -189,19 -201,4 +201,17 @@@ $CONFIG = array
  'customclient_desktop' => '', //http://owncloud.org/sync-clients/
  'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
  'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
- // date format to be used while writing to the owncloud logfile
- 'logdateformat' => 'F d, Y H:i:s',
 +
 +// PREVIEW
 +'enable_previews' => true,
 +/* the max width of a generated preview, if value is null, there is no limit */
 +'preview_max_x' => null,
 +/* the max height of a generated preview, if value is null, there is no limit */
 +'preview_max_y' => null,
 +/* the max factor to scale a preview, default is set to 10 */
 +'preview_max_scale_factor' => 10,
 +/* custom path for libreoffice / openoffice binary */
 +'preview_libreoffice_path' => '/usr/bin/libreoffice',
 +/* cl parameters for libreoffice / openoffice */
 +'preview_office_cl_parameters' => '',
  );

diff --cc core/css/styles.css
Simple merge

diff --cc lib/base.php
index 5043c4914751c1b9f7f2046d055c0410d9a24a4c,2e6a37c9f4e854bac44e89c8579283669f03c090..488634f86f39cc26a13c73a7343014543a468608
--- 1/lib/base.php
--- 2/lib/base.php
+++ b/lib/base.php
@@@ -490,8 -490,8 +490,9 @@@ class OC 
  
                self::registerCacheHooks();
                self::registerFilesystemHooks();
 +              self::registerPreviewHooks();
                self::registerShareHooks();
+               self::registerLogRotate();
  
                //make sure temporary files are cleaned up
                register_shutdown_function(array('OC_Helper', 'cleanTmp'));

diff --cc lib/helper.php
Simple merge