aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/Command/Upgrade.php8
-rw-r--r--core/Controller/AvatarController.php3
-rw-r--r--core/Controller/CSRFTokenController.php2
-rw-r--r--core/Controller/ClientFlowLoginV2Controller.php2
-rw-r--r--core/Controller/GuestAvatarController.php3
-rw-r--r--core/Controller/LoginController.php1
-rw-r--r--core/Controller/OCMController.php2
-rw-r--r--core/Controller/PreviewController.php3
-rw-r--r--core/Controller/ReferenceController.php2
-rw-r--r--core/Controller/WipeController.php2
-rw-r--r--core/l10n/hu.js4
-rw-r--r--core/l10n/hu.json4
-rw-r--r--core/l10n/nb.js2
-rw-r--r--core/l10n/nb.json2
-rw-r--r--core/l10n/sv.js10
-rw-r--r--core/l10n/sv.json10
16 files changed, 45 insertions, 15 deletions
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index a9ed4cf2fd1..6220c9a70d4 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -20,6 +20,7 @@ use OC\Updater;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
+use OCP\IURLGenerator;
use OCP\Util;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
@@ -36,6 +37,7 @@ class Upgrade extends Command {
public function __construct(
private IConfig $config,
+ private IURLGenerator $urlGenerator,
) {
parent::__construct();
}
@@ -205,7 +207,11 @@ class Upgrade extends Command {
. 'config.php and call this script again.</comment>', true);
return self::ERROR_MAINTENANCE_MODE;
} else {
- $output->writeln('<info>Nextcloud is already latest version</info>');
+ $output->writeln('<info>No upgrade required.</info>');
+ $output->writeln('');
+ $output->writeln('Note: This command triggers the upgrade actions associated with a new version. The new version\'s updated source files must be deployed in advance.');
+ $doc = $this->urlGenerator->linkToDocs('admin-update');
+ $output->writeln('See the upgrade documentation: ' . $doc . ' for more information.');
return self::ERROR_UP_TO_DATE;
}
}
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 4d5e810ddb9..f25a2d52752 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -13,6 +13,7 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
@@ -66,6 +67,7 @@ class AvatarController extends Controller {
#[NoCSRFRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}/dark')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
if ($size <= 64) {
if ($size !== 64) {
@@ -117,6 +119,7 @@ class AvatarController extends Controller {
#[NoCSRFRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function getAvatar(string $userId, int $size, bool $guestFallback = false) {
if ($size <= 64) {
if ($size !== 64) {
diff --git a/core/Controller/CSRFTokenController.php b/core/Controller/CSRFTokenController.php
index 8ea475941c8..4fdd669e144 100644
--- a/core/Controller/CSRFTokenController.php
+++ b/core/Controller/CSRFTokenController.php
@@ -13,6 +13,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
@@ -37,6 +38,7 @@ class CSRFTokenController extends Controller {
#[PublicPage]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/csrftoken')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function index(): JSONResponse {
if (!$this->request->passesStrictCookieCheck()) {
return new JSONResponse([], Http::STATUS_FORBIDDEN);
diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php
index b973a57924e..4bd2cddd12b 100644
--- a/core/Controller/ClientFlowLoginV2Controller.php
+++ b/core/Controller/ClientFlowLoginV2Controller.php
@@ -69,6 +69,7 @@ class ClientFlowLoginV2Controller extends Controller {
#[NoCSRFRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'POST', url: '/login/v2/poll')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function poll(string $token): JSONResponse {
try {
$creds = $this->loginFlowV2Service->poll($token);
@@ -275,6 +276,7 @@ class ClientFlowLoginV2Controller extends Controller {
#[NoCSRFRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'POST', url: '/login/v2')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function init(): JSONResponse {
// Get client user agent
$userAgent = $this->request->getHeader('USER_AGENT');
diff --git a/core/Controller/GuestAvatarController.php b/core/Controller/GuestAvatarController.php
index e87112726f2..7eef6828fec 100644
--- a/core/Controller/GuestAvatarController.php
+++ b/core/Controller/GuestAvatarController.php
@@ -9,6 +9,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\Response;
@@ -46,6 +47,7 @@ class GuestAvatarController extends Controller {
#[PublicPage]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/avatar/guest/{guestName}/{size}')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function getAvatar(string $guestName, int $size, ?bool $darkTheme = false) {
$darkTheme = $darkTheme ?? false;
@@ -97,6 +99,7 @@ class GuestAvatarController extends Controller {
#[PublicPage]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/avatar/guest/{guestName}/{size}/dark')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function getAvatarDark(string $guestName, int $size) {
return $this->getAvatar($guestName, $size, true);
}
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 19d5aae9613..ed884460b43 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -410,6 +410,7 @@ class LoginController extends Controller {
#[UseSession]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'POST', url: '/login/confirm')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function confirmPassword(string $password): DataResponse {
$loginName = $this->userSession->getLoginName();
$loginResult = $this->userManager->checkPassword($loginName, $password);
diff --git a/core/Controller/OCMController.php b/core/Controller/OCMController.php
index f15a4a56779..40d53cf7a97 100644
--- a/core/Controller/OCMController.php
+++ b/core/Controller/OCMController.php
@@ -14,6 +14,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\DataResponse;
use OCP\Capabilities\ICapability;
@@ -51,6 +52,7 @@ class OCMController extends Controller {
#[PublicPage]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/ocm-provider/')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function discovery(): DataResponse {
try {
$cap = Server::get(
diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php
index 2720da671be..9c9d49082bb 100644
--- a/core/Controller/PreviewController.php
+++ b/core/Controller/PreviewController.php
@@ -13,6 +13,7 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\RedirectResponse;
@@ -58,6 +59,7 @@ class PreviewController extends Controller {
#[NoAdminRequired]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/core/preview.png')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function getPreview(
string $file = '',
int $x = 32,
@@ -101,6 +103,7 @@ class PreviewController extends Controller {
#[NoAdminRequired]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/core/preview')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function getPreviewByFileId(
int $fileId = -1,
int $x = 32,
diff --git a/core/Controller/ReferenceController.php b/core/Controller/ReferenceController.php
index b4c88562bc9..6ed15e2d2f1 100644
--- a/core/Controller/ReferenceController.php
+++ b/core/Controller/ReferenceController.php
@@ -12,6 +12,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\DataDownloadResponse;
use OCP\AppFramework\Http\DataResponse;
@@ -43,6 +44,7 @@ class ReferenceController extends Controller {
#[PublicPage]
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/core/references/preview/{referenceId}')]
+ #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function preview(string $referenceId): DataDownloadResponse|DataResponse {
$reference = $this->referenceManager->getReferenceByCacheKey($referenceId);
diff --git a/core/Controller/WipeController.php b/core/Controller/WipeController.php
index d364e6399d9..1b57be71aa0 100644
--- a/core/Controller/WipeController.php
+++ b/core/Controller/WipeController.php
@@ -14,11 +14,13 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\AnonRateLimit;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Authentication\Exceptions\InvalidTokenException;
use OCP\IRequest;
+#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
class WipeController extends Controller {
public function __construct(
string $appName,
diff --git a/core/l10n/hu.js b/core/l10n/hu.js
index a3ecacced9d..ad5741cf59c 100644
--- a/core/l10n/hu.js
+++ b/core/l10n/hu.js
@@ -106,8 +106,8 @@ OC.L10N.register(
"Federated user" : "Föderált felhasználó",
"user@your-nextcloud.org" : "felhasználó@az-ön-nextcloudja.org",
"Create share" : "Megosztás létrehozása",
- "The remote URL must include the user." : "A távoli URL-nek tartalmaznia kell a felhasználót.",
- "Invalid remote URL." : "Érvénytelen távoli URL.",
+ "The remote URL must include the user." : "A távoli webcímnek tartalmaznia kell a felhasználót.",
+ "Invalid remote URL." : "Érvénytelen távoli webcím.",
"Failed to add the public link to your Nextcloud" : "Nem sikerült hozzáadni a nyilvános hivatkozást a Nexcloudjához",
"Direct link copied to clipboard" : "Közvetlen hivatkozás a vágólapra másolva",
"Please copy the link manually:" : "Másolja kézileg a hivatkozást:",
diff --git a/core/l10n/hu.json b/core/l10n/hu.json
index 1609947888d..a0de6333e38 100644
--- a/core/l10n/hu.json
+++ b/core/l10n/hu.json
@@ -104,8 +104,8 @@
"Federated user" : "Föderált felhasználó",
"user@your-nextcloud.org" : "felhasználó@az-ön-nextcloudja.org",
"Create share" : "Megosztás létrehozása",
- "The remote URL must include the user." : "A távoli URL-nek tartalmaznia kell a felhasználót.",
- "Invalid remote URL." : "Érvénytelen távoli URL.",
+ "The remote URL must include the user." : "A távoli webcímnek tartalmaznia kell a felhasználót.",
+ "Invalid remote URL." : "Érvénytelen távoli webcím.",
"Failed to add the public link to your Nextcloud" : "Nem sikerült hozzáadni a nyilvános hivatkozást a Nexcloudjához",
"Direct link copied to clipboard" : "Közvetlen hivatkozás a vágólapra másolva",
"Please copy the link manually:" : "Másolja kézileg a hivatkozást:",
diff --git a/core/l10n/nb.js b/core/l10n/nb.js
index 69118440866..c89461e2597 100644
--- a/core/l10n/nb.js
+++ b/core/l10n/nb.js
@@ -180,6 +180,7 @@ OC.L10N.register(
"Schedule work & meetings, synced with all your devices." : "Planlegg jobb og møter, synkronisert med alle dine enheter.",
"Keep your colleagues and friends in one place without leaking their private info." : "Ha dine kollegaer og venner på en plass uten å lekke deres private info.",
"Simple email app nicely integrated with Files, Contacts and Calendar." : "Enkel e-post app smidig integrert med Filer, Kontakter og Kalender.",
+ "Chatting, video calls, screen sharing, online meetings and web conferencing – in your browser and with mobile apps." : "Chatting, videosamtaler, skjermdeling, nettmøter og webkonferanser – i din nettleser og med mobilapper.",
"Collaborative documents, spreadsheets and presentations, built on Collabora Online." : "Samarbeidsdokumenter, regneark og presentasjoner, bygget på Collabora Online.",
"Distraction free note taking app." : "Distraksjonsfri notatapp.",
"Settings menu" : "Meny for innstillinger",
@@ -262,6 +263,7 @@ OC.L10N.register(
"Rename" : "Gi nytt navn",
"Collaborative tags" : "Samarbeidsmerkelapper",
"No tags found" : "Ingen emneknagger funnet",
+ "Clipboard not available, please copy manually" : "Utklippstavlen ikke tilgjengelig, kopier manuelt",
"Personal" : "Personlig",
"Accounts" : "Kontoer",
"Admin" : "Admin",
diff --git a/core/l10n/nb.json b/core/l10n/nb.json
index df4148bec07..81d06837fd7 100644
--- a/core/l10n/nb.json
+++ b/core/l10n/nb.json
@@ -178,6 +178,7 @@
"Schedule work & meetings, synced with all your devices." : "Planlegg jobb og møter, synkronisert med alle dine enheter.",
"Keep your colleagues and friends in one place without leaking their private info." : "Ha dine kollegaer og venner på en plass uten å lekke deres private info.",
"Simple email app nicely integrated with Files, Contacts and Calendar." : "Enkel e-post app smidig integrert med Filer, Kontakter og Kalender.",
+ "Chatting, video calls, screen sharing, online meetings and web conferencing – in your browser and with mobile apps." : "Chatting, videosamtaler, skjermdeling, nettmøter og webkonferanser – i din nettleser og med mobilapper.",
"Collaborative documents, spreadsheets and presentations, built on Collabora Online." : "Samarbeidsdokumenter, regneark og presentasjoner, bygget på Collabora Online.",
"Distraction free note taking app." : "Distraksjonsfri notatapp.",
"Settings menu" : "Meny for innstillinger",
@@ -260,6 +261,7 @@
"Rename" : "Gi nytt navn",
"Collaborative tags" : "Samarbeidsmerkelapper",
"No tags found" : "Ingen emneknagger funnet",
+ "Clipboard not available, please copy manually" : "Utklippstavlen ikke tilgjengelig, kopier manuelt",
"Personal" : "Personlig",
"Accounts" : "Kontoer",
"Admin" : "Admin",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index cfe87180397..718d011727f 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -61,8 +61,8 @@ OC.L10N.register(
"[%d / %d]: %s" : "[%d / %d]: %s",
"Repair step:" : "Reparationssteg: ",
"Repair info:" : "Reparationsinfo:",
- "Repair warning:" : "Reperationsvarning:",
- "Repair error:" : "Reperationsfel:",
+ "Repair warning:" : "Reparationsvarning:",
+ "Repair error:" : "Reparationsfel:",
"Please use the command line updater because updating via browser is disabled in your config.php." : "Var vänlig och uppdatera via kommandotolken då uppdatering via webbläsaren är inaktiverat i config.php",
"Turned on maintenance mode" : "Aktiverade underhållsläge",
"Turned off maintenance mode" : "Inaktivera underhållsläge",
@@ -242,8 +242,8 @@ OC.L10N.register(
"Rename project" : "Byt namn på projekt",
"Failed to rename the project" : "Kunde inte byta namn på projektet",
"Failed to create a project" : "Kunde inte skapa projekt",
- "Failed to add the item to the project" : "Kunde inte att lägga till objektet i projektet",
- "Connect items to a project to make them easier to find" : "Länka objekt till ett projekt för att göra dem enklare att hitta",
+ "Failed to add the item to the project" : "Kunde inte lägga till objektet i projektet",
+ "Connect items to a project to make them easier to find" : "Koppla objekt till ett projekt för att göra dem enklare att hitta",
"Type to search for existing projects" : "Skriv för att söka efter befintliga projekt",
"New in" : "Ny i",
"View changelog" : "Visa ändringslogg",
@@ -412,6 +412,6 @@ OC.L10N.register(
"Confirm" : "Bekräfta",
"App token" : "Apptoken",
"Alternative log in using app token" : "Alternativ inloggning med apptoken",
- "Please use the command line updater because you have a big instance with more than 50 users." : "Vänligen uppdatera med kommando eftersom du har en stor instans med mer än 50 användare."
+ "Please use the command line updater because you have a big instance with more than 50 users." : "Vänligen uppdatera via kommandoraden eftersom du har en stor instans med fler än 50 användare."
},
"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index 082d5339b07..1a5867c0789 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -59,8 +59,8 @@
"[%d / %d]: %s" : "[%d / %d]: %s",
"Repair step:" : "Reparationssteg: ",
"Repair info:" : "Reparationsinfo:",
- "Repair warning:" : "Reperationsvarning:",
- "Repair error:" : "Reperationsfel:",
+ "Repair warning:" : "Reparationsvarning:",
+ "Repair error:" : "Reparationsfel:",
"Please use the command line updater because updating via browser is disabled in your config.php." : "Var vänlig och uppdatera via kommandotolken då uppdatering via webbläsaren är inaktiverat i config.php",
"Turned on maintenance mode" : "Aktiverade underhållsläge",
"Turned off maintenance mode" : "Inaktivera underhållsläge",
@@ -240,8 +240,8 @@
"Rename project" : "Byt namn på projekt",
"Failed to rename the project" : "Kunde inte byta namn på projektet",
"Failed to create a project" : "Kunde inte skapa projekt",
- "Failed to add the item to the project" : "Kunde inte att lägga till objektet i projektet",
- "Connect items to a project to make them easier to find" : "Länka objekt till ett projekt för att göra dem enklare att hitta",
+ "Failed to add the item to the project" : "Kunde inte lägga till objektet i projektet",
+ "Connect items to a project to make them easier to find" : "Koppla objekt till ett projekt för att göra dem enklare att hitta",
"Type to search for existing projects" : "Skriv för att söka efter befintliga projekt",
"New in" : "Ny i",
"View changelog" : "Visa ändringslogg",
@@ -410,6 +410,6 @@
"Confirm" : "Bekräfta",
"App token" : "Apptoken",
"Alternative log in using app token" : "Alternativ inloggning med apptoken",
- "Please use the command line updater because you have a big instance with more than 50 users." : "Vänligen uppdatera med kommando eftersom du har en stor instans med mer än 50 användare."
+ "Please use the command line updater because you have a big instance with more than 50 users." : "Vänligen uppdatera via kommandoraden eftersom du har en stor instans med fler än 50 användare."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file