summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/accessibility/l10n/el.js5
-rw-r--r--apps/accessibility/l10n/el.json5
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--apps/files/lib/Controller/ViewController.php2
-rw-r--r--apps/files/templates/appnavigation.php37
-rw-r--r--apps/oauth2/tests/Settings/AdminTest.php2
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php2
-rw-r--r--apps/theming/css/theming.scss2
-rw-r--r--core/l10n/eu.js1
-rw-r--r--core/l10n/eu.json1
-rw-r--r--lib/private/Comments/Manager.php22
-rw-r--r--package-lock.json204
-rw-r--r--package.json4
-rw-r--r--settings/l10n/hu.js19
-rw-r--r--settings/l10n/hu.json19
-rw-r--r--tests/ui-regression/package.json1
16 files changed, 213 insertions, 115 deletions
diff --git a/apps/accessibility/l10n/el.js b/apps/accessibility/l10n/el.js
index e8276e52bb0..d3ecf511dbd 100644
--- a/apps/accessibility/l10n/el.js
+++ b/apps/accessibility/l10n/el.js
@@ -13,6 +13,9 @@ OC.L10N.register(
"Web Content Accessibility Guidelines" : "Οδηγίες προσβασιμότητας περιεχομένου ιστού",
"our issue tracker" : "ο ανιχνευτής ζητημάτων μας",
"our design team" : "η ομάδα σχεδιασμού μας",
- "Enable" : "Ενεργοποίηση"
+ "Enable" : "Ενεργοποίηση",
+ "Themes" : "Θέματα",
+ "Fonts" : "Γραμματοσειρές",
+ "enabled" : "ενεργοποιημένο"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/accessibility/l10n/el.json b/apps/accessibility/l10n/el.json
index bd2dd4483aa..867c14748cf 100644
--- a/apps/accessibility/l10n/el.json
+++ b/apps/accessibility/l10n/el.json
@@ -11,6 +11,9 @@
"Web Content Accessibility Guidelines" : "Οδηγίες προσβασιμότητας περιεχομένου ιστού",
"our issue tracker" : "ο ανιχνευτής ζητημάτων μας",
"our design team" : "η ομάδα σχεδιασμού μας",
- "Enable" : "Ενεργοποίηση"
+ "Enable" : "Ενεργοποίηση",
+ "Themes" : "Θέματα",
+ "Fonts" : "Γραμματοσειρές",
+ "enabled" : "ενεργοποιημένο"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 22b5a82326a..753b546b69d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2189,7 +2189,7 @@
_updateDirectoryPermissions: function() {
var isCreatable = (this.dirInfo.permissions & OC.PERMISSION_CREATE) !== 0 && this.$el.find('#free_space').val() !== '0';
- this.$el.find('#permissions').val(permissions);
+ this.$el.find('#permissions').val(this.dirInfo.permissions);
this.$el.find('.creatable').toggleClass('hidden', !isCreatable);
this.$el.find('.notCreatable').toggleClass('hidden', isCreatable);
},
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index cf1b4374da4..49f1818780b 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -227,7 +227,7 @@ class ViewController extends Controller {
$nav->assign('navigationItems', $navItems);
- $nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
+ $nav->assign('usage', \OC_Helper::humanFileSize(ceil($storageInfo['used'] / 102400) * 102400));
if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
$totalSpace = $this->l10n->t('Unlimited');
} else {
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index fecaa8401a9..b4436714985 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -9,26 +9,23 @@
}
?>
- <li id="quota"
- class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?><?php
- if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
- ?>has-tooltip" title="<?php p($_['usage_relative'] . '%, ');
- p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
- } ?>">
- <a href="#" class="icon-quota svg">
- <p id="quotatext"><?php
- if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
- p($l->t('%1$s%% of %2$s used', [round($_['usage_relative'], 1), $_['total_space']]));
- } else {
- p($l->t('%s used', [$_['usage']]));
- } ?></p>
- <div class="quota-container">
- <progress value="<?php p($_['usage_relative']); ?>"
- max="100"
- <?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
- </div>
- </a>
- </li>
+ <?php if($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
+ <li id="quota" class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>">
+ <a href="#" class="icon-quota svg">
+ <p><?php p($l->t('%s used', [$_['usage']])); ?></p>
+ </a>
+ </li>
+ <?php else: ?>
+ <li id="quota" class="has-tooltip pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>"
+ title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); ?>">
+ <a href="#" class="icon-quota svg">
+ <p id="quotatext"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p>
+ <div class="quota-container">
+ <progress value="<?php p($_['usage_relative']); ?>" max="100" class="<?= ($_['usage_relative'] > 80) ? 'warn' : '' ?>"></progress>
+ </div>
+ </a>
+ </li>
+ <?php endif; ?>
</ul>
<div id="app-settings">
<div id="app-settings-header">
diff --git a/apps/oauth2/tests/Settings/AdminTest.php b/apps/oauth2/tests/Settings/AdminTest.php
index 8b0883c7564..022ae913e1e 100644
--- a/apps/oauth2/tests/Settings/AdminTest.php
+++ b/apps/oauth2/tests/Settings/AdminTest.php
@@ -51,6 +51,6 @@ class AdminTest extends TestCase {
}
public function testGetPriority() {
- $this->assertSame(0, $this->admin->getPriority());
+ $this->assertSame(100, $this->admin->getPriority());
}
}
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 30b3dc79169..9bfe5e733f4 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -587,7 +587,7 @@ class ShareByMailProvider implements IShareProvider {
);
}
- $bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already send to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
+ $bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
$message = $this->mailer->createMessage();
$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 23c12be7b2d..4d63674e35e 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -67,7 +67,7 @@ $invert: luma($color-primary) > 0.6;
}
a,
label,
- p,
+ footer p,
#alternative-logins legend,
.lost-password-container #lost-password {
color: $color-primary-text;
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index 73a8fb45e43..707eaabc1b6 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -85,6 +85,7 @@ OC.L10N.register(
"Share link" : "Partekatu esteka",
"Could not unshare" : "Ezin izan da despartekatu",
"Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin partekatuta",
+ "Shared with you and {circle} by {owner}" : " {owner}-(e)k zurekin eta {circle}-(r)ekin partekatua",
"Shared with you by {owner}" : "{owner}-k zurekin partekatuta",
"Choose a password for the mail share" : "Hautatu pasahitz bat posta partekatzeko",
"group" : "taldea",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index f3c2205c156..1da8239e275 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -83,6 +83,7 @@
"Share link" : "Partekatu esteka",
"Could not unshare" : "Ezin izan da despartekatu",
"Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin partekatuta",
+ "Shared with you and {circle} by {owner}" : " {owner}-(e)k zurekin eta {circle}-(r)ekin partekatua",
"Shared with you by {owner}" : "{owner}-k zurekin partekatuta",
"Choose a password for the mail share" : "Hautatu pasahitz bat posta partekatzeko",
"group" : "taldea",
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
index 8df4a84a477..309b682767b 100644
--- a/lib/private/Comments/Manager.php
+++ b/lib/private/Comments/Manager.php
@@ -98,6 +98,15 @@ class Manager implements ICommentsManager {
return $data;
}
+
+ /**
+ * @param array $data
+ * @return IComment
+ */
+ public function getCommentFromData(array $data): IComment {
+ return new Comment($this->normalizeDatabaseData($data));
+ }
+
/**
* prepares a comment for an insert or update operation after making sure
* all necessary fields have a value assigned.
@@ -253,7 +262,8 @@ class Manager implements ICommentsManager {
throw new NotFoundException();
}
- $comment = new Comment($this->normalizeDatabaseData($data));
+
+ $comment = $this->getCommentFromData($data);
$this->cache($comment);
return $comment;
}
@@ -308,7 +318,7 @@ class Manager implements ICommentsManager {
$resultStatement = $query->execute();
while ($data = $resultStatement->fetch()) {
- $comment = new Comment($this->normalizeDatabaseData($data));
+ $comment = $this->getCommentFromData($data);
$this->cache($comment);
$tree['replies'][] = [
'comment' => $comment,
@@ -367,7 +377,7 @@ class Manager implements ICommentsManager {
$resultStatement = $query->execute();
while ($data = $resultStatement->fetch()) {
- $comment = new Comment($this->normalizeDatabaseData($data));
+ $comment = $this->getCommentFromData($data);
$this->cache($comment);
$comments[] = $comment;
}
@@ -455,7 +465,7 @@ class Manager implements ICommentsManager {
$resultStatement = $query->execute();
while ($data = $resultStatement->fetch()) {
- $comment = new Comment($this->normalizeDatabaseData($data));
+ $comment = $this->getCommentFromData($data);
$this->cache($comment);
$comments[] = $comment;
}
@@ -485,7 +495,7 @@ class Manager implements ICommentsManager {
$result->closeCursor();
if ($row) {
- $comment = new Comment($this->normalizeDatabaseData($row));
+ $comment = $this->getCommentFromData($row);
$this->cache($comment);
return $comment;
}
@@ -532,7 +542,7 @@ class Manager implements ICommentsManager {
$comments = [];
$result = $query->execute();
while ($data = $result->fetch()) {
- $comment = new Comment($this->normalizeDatabaseData($data));
+ $comment = $this->getCommentFromData($data);
$this->cache($comment);
$comments[] = $comment;
}
diff --git a/package-lock.json b/package-lock.json
index 00134146d2d..0b849608b49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2611,6 +2611,12 @@
"minimalistic-crypto-utils": "^1.0.0"
}
},
+ "emoji-regex": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+ "dev": true
+ },
"emojis-list": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -2997,26 +3003,15 @@
}
},
"findup-sync": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
- "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+ "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
"dev": true,
"requires": {
"detect-file": "^1.0.0",
- "is-glob": "^3.1.0",
+ "is-glob": "^4.0.0",
"micromatch": "^3.0.4",
"resolve-dir": "^1.0.1"
- },
- "dependencies": {
- "is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
- "dev": true,
- "requires": {
- "is-extglob": "^2.1.0"
- }
- }
}
},
"flush-write-stream": {
@@ -3761,14 +3756,25 @@
}
},
"global-modules": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
- "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+ "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
"dev": true,
"requires": {
- "global-prefix": "^1.0.1",
- "is-windows": "^1.0.1",
- "resolve-dir": "^1.0.0"
+ "global-prefix": "^3.0.0"
+ },
+ "dependencies": {
+ "global-prefix": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+ "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+ "dev": true,
+ "requires": {
+ "ini": "^1.3.5",
+ "kind-of": "^6.0.2",
+ "which": "^1.3.1"
+ }
+ }
}
},
"global-prefix": {
@@ -6270,6 +6276,19 @@
"requires": {
"expand-tilde": "^2.0.0",
"global-modules": "^1.0.0"
+ },
+ "dependencies": {
+ "global-modules": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+ "dev": true,
+ "requires": {
+ "global-prefix": "^1.0.1",
+ "is-windows": "^1.0.1",
+ "resolve-dir": "^1.0.0"
+ }
+ }
}
},
"resolve-from": {
@@ -7301,13 +7320,13 @@
"integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg="
},
"url-loader": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.0.0.tgz",
- "integrity": "sha512-RT3cz+Lw+kFMCKLabMyogFrc/aRoAMJHmY5os1VDBlav+4t5vxUxKDn47zCSFAYAl+hM8YLg4TZwG4TkJaafkg==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.0.1.tgz",
+ "integrity": "sha512-nd+jtHG6VgYx/NnXxXSWCJ7FtHIhuyk6Pe48HKhq29Avq3r5FSdIrenvzlbb67A3SNFaQyLk0/lMZfubj0+5ww==",
"dev": true,
"requires": {
"loader-utils": "^1.1.0",
- "mime": "^2.0.3",
+ "mime": "^2.4.4",
"schema-utils": "^1.0.0"
},
"dependencies": {
@@ -7544,29 +7563,28 @@
}
},
"webpack-cli": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.4.tgz",
- "integrity": "sha512-ubJGQEKMtBSpT+LiL5hXvn2GIOWiRWItR1DGUqJRhwRBeGhpRXjvF5f0erqdRJLErkfqS5/Ldkkedh4AL5Q1ZQ==",
- "dev": true,
- "requires": {
- "chalk": "^2.4.1",
- "cross-spawn": "^6.0.5",
- "enhanced-resolve": "^4.1.0",
- "findup-sync": "^2.0.0",
- "global-modules": "^1.0.0",
- "import-local": "^2.0.0",
- "interpret": "^1.1.0",
- "loader-utils": "^1.1.0",
- "prettier": "^1.17.0",
- "supports-color": "^5.5.0",
- "v8-compile-cache": "^2.0.2",
- "yargs": "^12.0.5"
+ "version": "3.3.5",
+ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.5.tgz",
+ "integrity": "sha512-w0j/s42c5UhchwTmV/45MLQnTVwRoaUTu9fM5LuyOd/8lFoCNCELDogFoecx5NzRUndO0yD/gF2b02XKMnmAWQ==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.2",
+ "cross-spawn": "6.0.5",
+ "enhanced-resolve": "4.1.0",
+ "findup-sync": "3.0.0",
+ "global-modules": "2.0.0",
+ "import-local": "2.0.0",
+ "interpret": "1.2.0",
+ "loader-utils": "1.2.3",
+ "supports-color": "6.1.0",
+ "v8-compile-cache": "2.0.3",
+ "yargs": "13.2.4"
},
"dependencies": {
"ansi-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
"dev": true
},
"camelcase": {
@@ -7576,14 +7594,14 @@
"dev": true
},
"cliui": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
- "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+ "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
"dev": true,
"requires": {
- "string-width": "^2.1.1",
- "strip-ansi": "^4.0.0",
- "wrap-ansi": "^2.0.0"
+ "string-width": "^3.1.0",
+ "strip-ansi": "^5.2.0",
+ "wrap-ansi": "^5.1.0"
}
},
"cross-spawn": {
@@ -7599,6 +7617,12 @@
"which": "^1.2.9"
}
},
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true
+ },
"invert-kv": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
@@ -7631,29 +7655,39 @@
"mem": "^4.0.0"
}
},
- "prettier": {
- "version": "1.18.2",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
- "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
"dev": true
},
"string-width": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
- "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
"dev": true,
"requires": {
+ "emoji-regex": "^7.0.1",
"is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
+ "strip-ansi": "^5.1.0"
}
},
"strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
"dev": true,
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "^4.1.0"
+ }
+ },
+ "supports-color": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
}
},
"which-module": {
@@ -7662,30 +7696,46 @@
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
+ "wrap-ansi": {
+ "version": "5.1.0",
+ "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+ "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.0",
+ "string-width": "^3.0.0",
+ "strip-ansi": "^5.0.0"
+ }
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+ "dev": true
+ },
"yargs": {
- "version": "12.0.5",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
- "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+ "version": "13.2.4",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+ "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
"dev": true,
"requires": {
- "cliui": "^4.0.0",
- "decamelize": "^1.2.0",
+ "cliui": "^5.0.0",
"find-up": "^3.0.0",
- "get-caller-file": "^1.0.1",
- "os-locale": "^3.0.0",
+ "get-caller-file": "^2.0.1",
+ "os-locale": "^3.1.0",
"require-directory": "^2.1.1",
- "require-main-filename": "^1.0.1",
+ "require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
- "string-width": "^2.0.0",
+ "string-width": "^3.0.0",
"which-module": "^2.0.0",
- "y18n": "^3.2.1 || ^4.0.0",
- "yargs-parser": "^11.1.1"
+ "y18n": "^4.0.0",
+ "yargs-parser": "^13.1.0"
}
},
"yargs-parser": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
- "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+ "version": "13.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+ "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index d1b9062878b..3ec1190f840 100644
--- a/package.json
+++ b/package.json
@@ -75,11 +75,11 @@
"node-sass": "^4.12.0",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.1",
- "url-loader": "^2.0.0",
+ "url-loader": "^2.0.1",
"vue-loader": "^15.6.4",
"vue-template-compiler": "^2.6.10",
"webpack": "^4.35.0",
- "webpack-cli": "^3.3.4",
+ "webpack-cli": "^3.3.5",
"webpack-merge": "^4.2.1"
},
"browserslist": [
diff --git a/settings/l10n/hu.js b/settings/l10n/hu.js
index c910b56fe51..d4cd17b3988 100644
--- a/settings/l10n/hu.js
+++ b/settings/l10n/hu.js
@@ -73,8 +73,12 @@ OC.L10N.register(
"Go to %s" : "Menj ide: %s",
"Install Client" : "Kliens telepítés",
"Logged in user must be a subadmin" : "Nem rendszergazda felhasználóként kell bejelentkezzen",
+ "Create" : "Létrehozás",
+ "Change" : "Módosít",
"Delete" : "Törlés",
+ "Share" : "Megosztás",
"Unlimited" : "Korlátlan",
+ "Verifying" : "Ellenőrzés",
"Verifying …" : "Ellenőrzés...",
"Verify" : "Ellenőrzés",
"Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérlek várj, míg a migráció befejeződik.",
@@ -146,6 +150,7 @@ OC.L10N.register(
"Done" : "Kész",
"Copied!" : "Másolva!",
"Copy" : "Másol",
+ "Supported" : "Támogatott",
"Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "A hivatalos alkalmazásokat a közösség fejleszti. Ezek adják a központi funkcionalitásokat és éles rendszerekben használhatóak.",
"Official" : "Hivatalos",
"by" : "által",
@@ -349,6 +354,18 @@ OC.L10N.register(
"Help translate" : "Segítsen a fordításban",
"Locale" : "Területi beállítás",
"Current password" : "Jelenlegi jelszó",
- "Change password" : "Jelszó megváltoztatása"
+ "Change password" : "Jelszó megváltoztatása",
+ "Disconnect" : "Szétkapcsolás",
+ "iPhone iOS" : "iPhone iOS",
+ "iPad iOS" : "iPad iOS",
+ "iOS Client" : "iOS kliens",
+ "Android Client" : "Android kliens",
+ "Not supported!" : "Nem támogatott.",
+ "Press ⌘-C to copy." : "A másoláshoz nyomj ⌘-C-t.",
+ "Press Ctrl-C to copy." : "A másoláshoz nyomj Ctrl-C-t.",
+ "Error while loading browser sessions and device tokens" : "Hiba a böngésző munkamenet és az eszköz tokenek betöltése közben.",
+ "Default quota :" : "Alapértelmezett kvóta :",
+ "Follow us on Google+" : "Kövess Google+ -on",
+ "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Jelenleg használt: <strong>%s</strong>, ebből: <strong>%s</strong> (<strong>%s %%</strong>)"
},
"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hu.json b/settings/l10n/hu.json
index d9a8f932c91..d83e7426788 100644
--- a/settings/l10n/hu.json
+++ b/settings/l10n/hu.json
@@ -71,8 +71,12 @@
"Go to %s" : "Menj ide: %s",
"Install Client" : "Kliens telepítés",
"Logged in user must be a subadmin" : "Nem rendszergazda felhasználóként kell bejelentkezzen",
+ "Create" : "Létrehozás",
+ "Change" : "Módosít",
"Delete" : "Törlés",
+ "Share" : "Megosztás",
"Unlimited" : "Korlátlan",
+ "Verifying" : "Ellenőrzés",
"Verifying …" : "Ellenőrzés...",
"Verify" : "Ellenőrzés",
"Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérlek várj, míg a migráció befejeződik.",
@@ -144,6 +148,7 @@
"Done" : "Kész",
"Copied!" : "Másolva!",
"Copy" : "Másol",
+ "Supported" : "Támogatott",
"Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "A hivatalos alkalmazásokat a közösség fejleszti. Ezek adják a központi funkcionalitásokat és éles rendszerekben használhatóak.",
"Official" : "Hivatalos",
"by" : "által",
@@ -347,6 +352,18 @@
"Help translate" : "Segítsen a fordításban",
"Locale" : "Területi beállítás",
"Current password" : "Jelenlegi jelszó",
- "Change password" : "Jelszó megváltoztatása"
+ "Change password" : "Jelszó megváltoztatása",
+ "Disconnect" : "Szétkapcsolás",
+ "iPhone iOS" : "iPhone iOS",
+ "iPad iOS" : "iPad iOS",
+ "iOS Client" : "iOS kliens",
+ "Android Client" : "Android kliens",
+ "Not supported!" : "Nem támogatott.",
+ "Press ⌘-C to copy." : "A másoláshoz nyomj ⌘-C-t.",
+ "Press Ctrl-C to copy." : "A másoláshoz nyomj Ctrl-C-t.",
+ "Error while loading browser sessions and device tokens" : "Hiba a böngésző munkamenet és az eszköz tokenek betöltése közben.",
+ "Default quota :" : "Alapértelmezett kvóta :",
+ "Follow us on Google+" : "Kövess Google+ -on",
+ "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Jelenleg használt: <strong>%s</strong>, ebből: <strong>%s</strong> (<strong>%s %%</strong>)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/tests/ui-regression/package.json b/tests/ui-regression/package.json
index ec4e81bee9f..99f488122c4 100644
--- a/tests/ui-regression/package.json
+++ b/tests/ui-regression/package.json
@@ -9,7 +9,6 @@
"author": "",
"dependencies": {
"chai": "^4.1.2",
- "fs": "0.0.1-security",
"mocha": "^5.2.0",
"mocha-json-report": "0.0.2",
"pixelmatch": "^5.0.2",
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 02:51:28 +0000