diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 7eabb0d48c..ae9cb7e4c9 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -26,7 +26,7 @@ OC_Util::checkAdminUser();
if($_POST) {
// CSRF check
OCP\JSON::callCheck();
-
+
if(isset($_POST['webdav_url'])) {
OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
}
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 6704a00c5a..332b6a0bed 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -34,7 +34,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$shareWith = null;
}
- $token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']);
+ $token = OCP\Share::shareItem(
+ $_POST['itemType'],
+ $_POST['itemSource'],
+ $shareType,
+ $shareWith,
+ $_POST['permissions']
+ );
if (is_string($token)) {
OC_JSON::success(array('data' => array('token' => $token)));
@@ -59,7 +65,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
break;
case 'setPermissions':
if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
- $return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+ $return = OCP\Share::setPermissions(
+ $_POST['itemType'],
+ $_POST['itemSource'],
+ $_POST['shareType'],
+ $_POST['shareWith'],
+ $_POST['permissions']
+ );
($return) ? OC_JSON::success() : OC_JSON::error();
}
break;
@@ -86,9 +98,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
if ($type === 'dir')
$subject = (string)$l->t('User %s shared a folder with you', $displayName);
- $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
+ $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
+ array($displayName, $file, $link));
if ($type === 'dir')
- $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
+ $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
+ array($displayName, $file, $link));
$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
@@ -112,14 +126,29 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
break;
case 'getItem':
- if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) {
+ if (isset($_GET['itemType'])
+ && isset($_GET['itemSource'])
+ && isset($_GET['checkReshare'])
+ && isset($_GET['checkShares'])) {
if ($_GET['checkReshare'] == 'true') {
- $reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+ $reshare = OCP\Share::getItemSharedWithBySource(
+ $_GET['itemType'],
+ $_GET['itemSource'],
+ OCP\Share::FORMAT_NONE,
+ null,
+ true
+ );
} else {
$reshare = false;
}
if ($_GET['checkShares'] == 'true') {
- $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+ $shares = OCP\Share::getItemShared(
+ $_GET['itemType'],
+ $_GET['itemSource'],
+ OCP\Share::FORMAT_NONE,
+ null,
+ true
+ );
} else {
$shares = false;
}
@@ -165,8 +194,15 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
$offset += $limit;
foreach ($users as $uid => $displayName) {
- if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $uid != OC_User::getUser()) {
- $shareWith[] = array('label' => $displayName, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $uid));
+ if ((!isset($_GET['itemShares'])
+ || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])
+ || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]))
+ && $uid != OC_User::getUser()) {
+ $shareWith[] = array(
+ 'label' => $displayName,
+ 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER,
+ 'shareWith' => $uid)
+ );
$count++;
}
}
@@ -179,7 +215,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
- $shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
+ $shareWith[] = array(
+ 'label' => $group.' (group)',
+ 'value' => array(
+ 'shareType' => OCP\Share::SHARE_TYPE_GROUP,
+ 'shareWith' => $group
+ )
+ );
$count++;
}
} else {
diff --git a/core/css/styles.css b/core/css/styles.css
index 8a01211d8b..0c16b36873 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -36,8 +36,8 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
.header-right > * { vertical-align:middle; }
/* INPUTS */
-input[type="text"], input[type="password"] { cursor:text; }
-input[type="text"], input[type="password"], input[type="search"],
+input[type="text"], input[type="password"], input[type="number"] { cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"],
textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
width:10em; margin:.3em; padding:.6em .5em .4em;
font-size:1em; font-family:Arial, Verdana, sans-serif;
@@ -46,10 +46,11 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
}
input[type="hidden"] { height:0; width:0; }
-input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; }
-input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea { background:#f8f8f8; color:#555; cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
+input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
.searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
@@ -196,7 +197,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#show, #personal-show { display:none; }
#show + label { right:1em; top:1.25em!important; }
#show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-#show + label, #personal-show + label {
+#show + label, #personal-show + label {
position:absolute!important; height:14px; width:24px;
background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3;
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
new file mode 100644
index 0000000000..ce7e1e6980
Binary files /dev/null and b/core/img/actions/caret-dark.png differ
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
new file mode 100644
index 0000000000..abb1dc192d
--- /dev/null
+++ b/core/img/actions/caret-dark.svg
@@ -0,0 +1,102 @@
+
+
+
+
diff --git a/core/js/config.php b/core/js/config.php
index 9069175ed6..0aaa448228 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -29,8 +29,33 @@ $array = array(
"oc_current_user" => "\"".OC_User::getUser(). "\"",
"oc_requesttoken" => "\"".OC_Util::callRegister(). "\"",
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
- "dayNames" => json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))),
- "monthNames" => json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))),
+ "dayNames" => json_encode(
+ array(
+ (string)$l->t('Sunday'),
+ (string)$l->t('Monday'),
+ (string)$l->t('Tuesday'),
+ (string)$l->t('Wednesday'),
+ (string)$l->t('Thursday'),
+ (string)$l->t('Friday'),
+ (string)$l->t('Saturday')
+ )
+ ),
+ "monthNames" => json_encode(
+ array(
+ (string)$l->t('January'),
+ (string)$l->t('February'),
+ (string)$l->t('March'),
+ (string)$l->t('April'),
+ (string)$l->t('May'),
+ (string)$l->t('June'),
+ (string)$l->t('July'),
+ (string)$l->t('August'),
+ (string)$l->t('September'),
+ (string)$l->t('October'),
+ (string)$l->t('November'),
+ (string)$l->t('December')
+ )
+ ),
"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
);
@@ -38,4 +63,3 @@ $array = array(
foreach ($array as $setting => $value) {
echo("var ". $setting ."=".$value.";\n");
}
-?>
\ No newline at end of file
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 8c36254caf..834af44b38 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,8 +1,8 @@
"%s erabiltzaileak zurekin fitxategi bat partekatu du ",
-"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat partekatu du ",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri: %s",
+"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat elkarbanatu du ",
+"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat elkarbanatu du ",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin elkarbanatu du. Hemen duzu eskuragarri: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin elkarbanatu du. Hemen duzu eskuragarri: %s",
"Category type not provided." => "Kategoria mota ez da zehaztu.",
"No category to add?" => "Ez dago gehitzeko kategoriarik?",
"This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
@@ -58,8 +58,8 @@
"Error while sharing" => "Errore bat egon da elkarbanatzean",
"Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
"Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
-"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin partekatuta",
-"Shared with you by {owner}" => "{owner}-k zurekin partekatuta",
+"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+"Shared with you by {owner}" => "{owner}-k zurekin elkarbanatuta",
"Share with" => "Elkarbanatu honekin",
"Share with link" => "Elkarbanatu lotura batekin",
"Password protect" => "Babestu pasahitzarekin",
@@ -71,7 +71,7 @@
"Share via email:" => "Elkarbanatu eposta bidez:",
"No people found" => "Ez da inor aurkitu",
"Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
-"Shared in {item} with {user}" => "{user}ekin {item}-n partekatuta",
+"Shared in {item} with {user}" => "{user}ekin {item}-n elkarbanatuta",
"Unshare" => "Ez elkarbanatu",
"can edit" => "editatu dezake",
"access control" => "sarrera kontrola",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 75c378cece..1db5820bdf 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -5,6 +5,7 @@
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
"Category type not provided." => "סוג הקטגוריה לא סופק.",
"No category to add?" => "אין קטגוריה להוספה?",
+"This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s",
"Object type not provided." => "סוג הפריט לא סופק.",
"%s ID not provided." => "מזהה %s לא סופק.",
"Error adding %s to favorites." => "אירעה שגיאה בעת הוספת %s למועדפים.",
@@ -52,6 +53,7 @@
"Error" => "שגיאה",
"The app name is not specified." => "שם היישום לא צוין.",
"The required file {file} is not installed!" => "הקובץ הנדרש {file} אינו מותקן!",
+"Shared" => "שותף",
"Share" => "שתף",
"Error while sharing" => "שגיאה במהלך השיתוף",
"Error while unsharing" => "שגיאה במהלך ביטול השיתוף",
@@ -82,6 +84,8 @@
"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
"Sending ..." => "מתבצעת שליחה ...",
"Email sent" => "הודעת הדוא״ל נשלחה",
+"The update was unsuccessful. Please report this issue to the ownCloud community." => "תהליך העדכון לא הושלם בהצלחה. נא דווח את הבעיה בקהילת ownCloud.",
+"The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
"ownCloud password reset" => "איפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
@@ -105,6 +109,8 @@
"Security Warning" => "אזהרת אבטחה",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
+"For information how to properly configure your server, please see the documentation." => "לקבלת מידע להגדרה נכונה של השרת שלך, ראה את התיעוד.",
"Create an admin account" => "יצירת חשבון מנהל",
"Advanced" => "מתקדם",
"Data folder" => "תיקיית נתונים",
@@ -124,6 +130,7 @@
"Lost your password?" => "שכחת את ססמתך?",
"remember" => "שמירת הססמה",
"Log in" => "כניסה",
+"Alternative Logins" => "כניסות אלטרנטיביות",
"prev" => "הקודם",
"next" => "הבא",
"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 8d5485a4a5..97631d4df5 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -1,3 +1,64 @@
"Apps"
+"No category to add?" => "ထည့်ရန်ခေါင်းစဉ်မရှိဘူးလား",
+"No categories selected for deletion." => "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွေးထားပါ",
+"January" => "ဇန်နဝါရီ",
+"February" => "ဖေဖော်ဝါရီ",
+"March" => "မတ်",
+"April" => "ဧပြီ",
+"May" => "မေ",
+"June" => "ဇွန်",
+"July" => "ဇူလိုင်",
+"August" => "ဩဂုတ်",
+"September" => "စက်တင်ဘာ",
+"October" => "အောက်တိုဘာ",
+"November" => "နိုဝင်ဘာ",
+"December" => "ဒီဇင်ဘာ",
+"seconds ago" => "စက္ကန့်အနည်းငယ်က",
+"1 minute ago" => "၁ မိနစ်အရင်က",
+"1 hour ago" => "၁ နာရီ အရင်က",
+"today" => "ယနေ့",
+"yesterday" => "မနေ့က",
+"last month" => "ပြီးခဲ့သောလ",
+"last year" => "မနှစ်က",
+"years ago" => "နှစ် အရင်က",
+"Choose" => "ရွေးချယ်",
+"Cancel" => "ပယ်ဖျက်မည်",
+"No" => "မဟုတ်ဘူး",
+"Yes" => "ဟုတ်",
+"Ok" => "အိုကေ",
+"Password" => "စကားဝှက်",
+"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
+"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
+"Share via email:" => "အီးမေးလ်ဖြင့်ဝေမျှမည် -",
+"Resharing is not allowed" => "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+"can edit" => "ပြင်ဆင်နိုင်",
+"create" => "ဖန်တီးမည်",
+"delete" => "ဖျက်မည်",
+"share" => "ဝေမျှမည်",
+"Password protected" => "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+"You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
+"Username" => "သုံးစွဲသူအမည်",
+"Your password was reset" => "သင်၏စကားဝှက်ကိုပြန်ဖော်ပြီးပါပြီ။",
+"To login page" => "ဝင်ရောက်သည့်စာမျက်နှာသို့",
+"New password" => "စကားဝှက်အသစ်",
+"Users" => "သုံးစွဲသူ",
+"Apps" => "Apps",
+"Admin" => "အက်ဒမင်",
+"Help" => "အကူအညီ",
+"Cloud not found" => "မတွေ့ရှိမိပါ",
+"Add" => "ပေါင်းထည့်",
+"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
+"Create an admin account" => "အက်ဒမင်အကောင့်တစ်ခုဖန်တီးမည်",
+"Advanced" => "အဆင့်မြင့်",
+"Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
+"Database user" => "Database သုံးစွဲသူ",
+"Database password" => "Database စကားဝှက်",
+"Database name" => "Database အမည်",
+"Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
+"Lost your password?" => "သင်၏စကားဝှက်ပျောက်သွားပြီလား။",
+"remember" => "မှတ်မိစေသည်",
+"Log in" => "ဝင်ရောက်ရန်",
+"prev" => "ယခင်",
+"next" => "နောက်သို့"
);
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 62d6cf2ade..4059c7e047 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -5,7 +5,9 @@
bug tracker, please copy the following informations into the description.
; ?>)
+ 
" />t('Download')?>
+  +' "'+t('files', 'delete file permanently')+'")
';
var files = tr.attr('data-file');
deleteAction[0].outerHTML = newHTML;
-
+
$.post(OC.filePath('files_trashbin','ajax','delete.php'),
{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
function(result){
@@ -46,9 +46,9 @@ $(document).ready(function() {
OC.dialogs.alert(result.data.message, 'Error');
}
});
-
+
});
-
+
// Sets the select_all checkbox behaviour :
$('#select_all').click(function() {
if($(this).attr('checked')){
@@ -91,18 +91,18 @@ $(document).ready(function() {
}
processSelection();
});
-
+
$('.undelete').click('click',function(event) {
var spinner = ' +' "'+t('files_trashbin', 'perform restore operation')+'")
';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];
-
+
for (var i=0; i