merge master into filesystem

diff --cc apps/files/ajax/move.php
index 7c1ec974a3dfa6d92b0dd13774a8713129762a03,74374c57b8bdf4252ed1bdc4637847751f9b3f89..99e43ed23be58d1721f6d3b0f77e1a6a8044fe6f
--- 1/apps/files/ajax/move.php
--- 2/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@@ -7,12 -7,14 +7,12 @@@ OCP\JSON::checkLoggedIn()
  OCP\JSON::callCheck();
  
  // Get data
- $dir = stripslashes($_GET["dir"]);
- $file = stripslashes($_GET["file"]);
- $target = stripslashes(rawurldecode($_GET["target"]));
+ $dir = stripslashes($_POST["dir"]);
+ $file = stripslashes($_POST["file"]);
+ $target = stripslashes(rawurldecode($_POST["target"]));
  
 -$l=OC_L10N::get('files');
 -
 -if(OC_Filesystem::file_exists($target . '/' . $file)) {
 -      OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s - File with this name already exists", array($file)) )));
 +if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
 +      OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" )));
        exit;
  }
  

diff --cc apps/files/css/files.css
index f5948fd15ea9ca1e134ab1c0ddb3963f1aed676c,9ff550189db15477f2f7294e164583e2012906ca..748bc2e63a1748060d9631993c3f70f3f7fab5b9
--- 1/apps/files/css/files.css
--- 2/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@@ -123,11 -123,13 +123,21 @@@ a.action>img { max-height:16px; max-wid
  
  div.crumb a{ padding:0.9em 0 0.7em 0; }
  
 -}
+ table.dragshadow {
+       width:auto;
+ }
+ table.dragshadow td.filename {
+       padding-left:36px;
+       padding-right:16px;
+ }
+ table.dragshadow td.size {
+       padding-right:8px;
++}
 +#upgrade {
 +      width: 400px;
 +      position: absolute;
 +      top: 200px;
 +      left: 50%;
 +      text-align: center;
 +      margin-left: -200px;
 +}

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

diff --cc apps/files_sharing/public.php
index 78eb63985f6e86f51d01ba87744819a4dd56924c,5672c78dc33bb0ce6027016d32af765f9c2afcac..9cf45e56fb94ce1c750822f366fe30b0ce0293dc
--- 1/apps/files_sharing/public.php
--- 2/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@@ -217,9 -207,10 +217,10 @@@ if ($linkItem) 
                OCP\Util::addScript('files', 'fileactions');
                $tmpl = new OCP\Template('files_sharing', 'public', 'base');
                $tmpl->assign('uidOwner', $shareOwner);
+               $tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner));
                $tmpl->assign('dir', $dir);
                $tmpl->assign('filename', $file);
 -              $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
 +              $tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
                if (isset($_GET['path'])) {
                        $getPath = $_GET['path'];
                } else {

diff --cc db_structure.xml
Simple merge

diff --cc lib/base.php
Simple merge

diff --cc lib/helper.php
Simple merge

diff --cc lib/public/share.php
Simple merge

diff --cc lib/util.php
index f947ed9c178f787d35cf7f8dc2055df76a38a1e5,0543df979d33949859bc34d08e6ff03a95200c06..f2d2e782ffcb8a13696982c9b3ea5ed54839a46e
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -74,7 -95,7 +74,7 @@@ class OC_Util 
         */
        public static function getVersion() {
                // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.90.0. This is not visible to the user
-               return array(4,91,8);
 -              return array(4, 91, 03);
++              return array(4, 91, 8);
        }
  
        /**