aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/ast.js3
-rw-r--r--lib/l10n/ast.json3
-rw-r--r--lib/l10n/az.js2
-rw-r--r--lib/l10n/az.json2
-rw-r--r--lib/l10n/id.js2
-rw-r--r--lib/l10n/id.json2
-rw-r--r--lib/l10n/sc.js1
-rw-r--r--lib/l10n/sc.json1
-rw-r--r--lib/private/Authentication/TwoFactorAuth/Manager.php4
-rw-r--r--lib/private/Log/Rotate.php2
-rw-r--r--lib/private/TemplateLayout.php4
11 files changed, 19 insertions, 7 deletions
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index 7635cc90e60..3cccc8cc6e9 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Other activities" : "Otres actividaes",
"The library %s is not available." : "La biblioteca «%s» nun ta disponible.",
"Authentication" : "Autenticación",
+ "Files" : "Ficheros",
+ "View profile" : "Ver el perfil",
"today" : "güei",
"tomorrow" : "mañana",
"yesterday" : "ayeri",
@@ -13,6 +15,7 @@ OC.L10N.register(
"Apps" : "Aplicaciones",
"Personal settings" : "Configuración personal",
"Settings" : "Configuración",
+ "Log out" : "Zarrar la sesión",
"Fediverse" : "Fediversu",
"Twitter" : "Twitter",
"Website" : "Sitiu web",
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index af224611393..6ee37fbd777 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -2,6 +2,8 @@
"Other activities" : "Otres actividaes",
"The library %s is not available." : "La biblioteca «%s» nun ta disponible.",
"Authentication" : "Autenticación",
+ "Files" : "Ficheros",
+ "View profile" : "Ver el perfil",
"today" : "güei",
"tomorrow" : "mañana",
"yesterday" : "ayeri",
@@ -11,6 +13,7 @@
"Apps" : "Aplicaciones",
"Personal settings" : "Configuración personal",
"Settings" : "Configuración",
+ "Log out" : "Zarrar la sesión",
"Fediverse" : "Fediversu",
"Twitter" : "Twitter",
"Website" : "Sitiu web",
diff --git a/lib/l10n/az.js b/lib/l10n/az.js
index 20d1ce300a1..59b0dfcbba8 100644
--- a/lib/l10n/az.js
+++ b/lib/l10n/az.js
@@ -4,10 +4,12 @@ OC.L10N.register(
"Cannot write into \"config\" directory!" : "\"configurasiya\" direktoriyasının daxilində yazmaq mümkün deyil",
"See %s" : "Bax %s",
"Sample configuration detected" : "Konfiqurasiya nüsxəsi təyin edildi",
+ "Authentication" : "Autentifikasiya",
"Unknown filetype" : "Fayl tipi bəlli deyil.",
"Invalid image" : "Yalnış şəkil",
"Files" : "Fayllar",
"today" : "Bu gün",
+ "yesterday" : "dünən",
"seconds ago" : "saniyələr öncə",
"__language_name__" : "Azərbaycan dili",
"Help" : "Kömək",
diff --git a/lib/l10n/az.json b/lib/l10n/az.json
index b88fbb1337d..f0f3b8a5e05 100644
--- a/lib/l10n/az.json
+++ b/lib/l10n/az.json
@@ -2,10 +2,12 @@
"Cannot write into \"config\" directory!" : "\"configurasiya\" direktoriyasının daxilində yazmaq mümkün deyil",
"See %s" : "Bax %s",
"Sample configuration detected" : "Konfiqurasiya nüsxəsi təyin edildi",
+ "Authentication" : "Autentifikasiya",
"Unknown filetype" : "Fayl tipi bəlli deyil.",
"Invalid image" : "Yalnış şəkil",
"Files" : "Fayllar",
"today" : "Bu gün",
+ "yesterday" : "dünən",
"seconds ago" : "saniyələr öncə",
"__language_name__" : "Azərbaycan dili",
"Help" : "Kömək",
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 7dc88e95615..2db32b3692f 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -129,7 +129,7 @@ OC.L10N.register(
"Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
"No database drivers (sqlite, mysql, or postgresql) installed." : "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.",
"PHP module %s not installed." : "Module PHP %s tidak terinstal.",
- "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.",
+ "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal modul.",
"PHP setting \"%s\" is not set to \"%s\"." : "Pengaturan PHP \"%s\" tidak diatur ke \"%s\".",
"Adjusting this setting in php.ini will make Nextcloud run again" : "Menyesuaikan pengaturan ini di php.ini akan membuat Nextcloud berjalan kembali",
"PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya PHP diatur untuk memotong inline doc blocks. Hal ini akan menyebabkan beberapa aplikasi inti menjadi tidak dapat diakses.",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index 56595375abb..4e39125f693 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -127,7 +127,7 @@
"Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
"No database drivers (sqlite, mysql, or postgresql) installed." : "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.",
"PHP module %s not installed." : "Module PHP %s tidak terinstal.",
- "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.",
+ "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal modul.",
"PHP setting \"%s\" is not set to \"%s\"." : "Pengaturan PHP \"%s\" tidak diatur ke \"%s\".",
"Adjusting this setting in php.ini will make Nextcloud run again" : "Menyesuaikan pengaturan ini di php.ini akan membuat Nextcloud berjalan kembali",
"PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya PHP diatur untuk memotong inline doc blocks. Hal ini akan menyebabkan beberapa aplikasi inti menjadi tidak dapat diakses.",
diff --git a/lib/l10n/sc.js b/lib/l10n/sc.js
index 6ac2f72fab9..e4fa1ebda45 100644
--- a/lib/l10n/sc.js
+++ b/lib/l10n/sc.js
@@ -6,6 +6,7 @@ OC.L10N.register(
"See %s" : "Càstia %s",
"Sample configuration detected" : "S'at agatadu una cunfiguratzione de esèmpiu",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Est istadu iscobertu ca sa cunfiguratzione de esèmpiu est istada copiada. Custu podet blocare s'installatzione e no est suportadu. Leghe sa documentatzione in config.php antis de fàghere càmbios.",
+ "The page could not be found on the server." : "Impossìbile agatare custa pàgina in su serbidore.",
"Other activities" : "Àteras atividades",
"%1$s and %2$s" : "%1$s e %2$s",
"%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s",
diff --git a/lib/l10n/sc.json b/lib/l10n/sc.json
index e1df080a887..e70d274c472 100644
--- a/lib/l10n/sc.json
+++ b/lib/l10n/sc.json
@@ -4,6 +4,7 @@
"See %s" : "Càstia %s",
"Sample configuration detected" : "S'at agatadu una cunfiguratzione de esèmpiu",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Est istadu iscobertu ca sa cunfiguratzione de esèmpiu est istada copiada. Custu podet blocare s'installatzione e no est suportadu. Leghe sa documentatzione in config.php antis de fàghere càmbios.",
+ "The page could not be found on the server." : "Impossìbile agatare custa pàgina in su serbidore.",
"Other activities" : "Àteras atividades",
"%1$s and %2$s" : "%1$s e %2$s",
"%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s",
diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php
index b0bb73c3115..4defcb9a585 100644
--- a/lib/private/Authentication/TwoFactorAuth/Manager.php
+++ b/lib/private/Authentication/TwoFactorAuth/Manager.php
@@ -318,8 +318,8 @@ class Manager {
return false;
}
- // If we are authenticated using an app password skip all this
- if ($this->session->exists('app_password')) {
+ // If we are authenticated using an app password or AppAPI Auth, skip all this
+ if ($this->session->exists('app_password') || $this->session->get('app_api') === true) {
return false;
}
diff --git a/lib/private/Log/Rotate.php b/lib/private/Log/Rotate.php
index 4c0e258b2f9..efe548b7783 100644
--- a/lib/private/Log/Rotate.php
+++ b/lib/private/Log/Rotate.php
@@ -43,7 +43,7 @@ class Rotate extends \OCP\BackgroundJob\Job {
if ($this->shouldRotateBySize()) {
$rotatedFile = $this->rotate();
$msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"';
- \OC::$server->getLogger()->warning($msg, ['app' => Rotate::class]);
+ \OC::$server->getLogger()->info($msg, ['app' => Rotate::class]);
}
}
}
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index d99bd943265..96d0ae3e517 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -113,9 +113,9 @@ class TemplateLayout extends \OC_Template {
$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
- Util::addScript('core', 'unified-search', 'core');
+ Util::addScript('core', 'legacy-unified-search', 'core');
} else {
- Util::addScript('core', 'global-search', 'core');
+ Util::addScript('core', 'unified-search', 'core');
}
// Set body data-theme
$this->assign('enabledThemes', []);
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 23:23:15 +0000