diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index db8b8ff57ba..f15cd514241 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -10,7 +10,7 @@
.file_upload_form, #file_newfolder_form { display:inline; float: left; margin-left:0; }
#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
-.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:0;}
+.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:block; float:left; padding-left:0; overflow:hidden; position:relative; margin:0;}
.file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
#new { background-color:#5bb75b; float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; }
#new:hover, a.file_upload_button_wrapper:hover + button.file_upload_filename { background-color:#4b964b; }
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
new file mode 100644
index 00000000000..b8e700e3802
--- /dev/null
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -0,0 +1,9 @@
+ "Palavra-Passe",
+"Submit" => "Submeter",
+"%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
+"%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
+"Download" => "Descarregar",
+"No preview available for" => "Não há pré-visualização para",
+"web services under your control" => "serviços web sob o seu controlo"
+);
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 525ffa83578..15377680ab8 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,6 +1,26 @@
execute(array($_GET['token']))->fetchOne();
+ if(isset($filepath)) {
+ $info = OC_FileCache_Cached::get($filepath, '');
+ if(strtolower($info['mimetype']) == 'httpd/unix-directory') {
+ $_GET['dir'] = $filepath;
+ } else {
+ $_GET['file'] = $filepath;
+ }
+ \OCP\Util::writeLog('files_sharing', 'You have files that are shared by link originating from ownCloud 4.0. Redistribute the new links, because backwards compatibility will be removed in ownCloud 5.', \OCP\Util::WARN);
+ }
+}
+// Enf of backward compatibility
+
if (isset($_GET['file']) || isset($_GET['dir'])) {
if (isset($_GET['dir'])) {
$type = 'folder';
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
index eb80eec6ed8..2ddf70cc6c5 100644
--- a/apps/files_versions/l10n/pt_PT.php
+++ b/apps/files_versions/l10n/pt_PT.php
@@ -3,5 +3,6 @@
"History" => "Histórico",
"Versions" => "Versões",
"This will delete all existing backup versions of your files" => "Isto irá apagar todas as versões de backup do seus ficheiros",
+"Files Versioning" => "Versionamento de Ficheiros",
"Enable" => "Activar"
);
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 389679b80bd..bd9f7e0c552 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -237,7 +237,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
}
//getting dn, if false the group does not exist. If dn, it may be mapped only, requires more checking.
- $dn = $this->username2dn($gid);
+ $dn = $this->groupname2dn($gid);
if(!$dn) {
$this->connection->writeToCache('groupExists'.$gid, false);
return false;
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index d855ae2a163..66007d09536 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -123,7 +123,13 @@ abstract class Access {
* returns the LDAP DN for the given internal ownCloud name of the group
*/
public function groupname2dn($name) {
- return $this->ocname2dn($name, false);
+ $dn = $this->ocname2dn($name, false);
+
+ if($dn) {
+ return $dn;
+ }
+
+ return false;
}
/**
diff --git a/core/js/share.js b/core/js/share.js
index 6c26fed18be..e67b333dfc1 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -267,9 +267,13 @@ OC.Share={
if (permissions & OC.PERMISSION_SHARE) {
shareChecked = 'checked="checked"';
}
- var html = '';
+ var html = '';
html += '+')
';
- html += shareWith;
+ if(shareWith.length > 14){
+ html += shareWith.substr(0,11) + '...';
+ }else{
+ html += shareWith;
+ }
if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
if (editChecked == '') {
html += '