Merge branch 'master' into implement_712

21 files changed, 146 insertions, 3 deletions

diff --git a/core/Application.php b/core/Application.php
index a0deaff2b93..e8c924432d1 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -186,6 +186,9 @@ class Application extends App {
 		$container->registerService('TwoFactorAuthManager', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getTwoFactorAuthManager();
 		});
+		$container->registerService('OC\CapabilitiesManager', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getCapabilitiesManager();
+		});
 	}
 
 }
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index 77d67534c6a..69354272de8 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -250,10 +250,10 @@ class Upgrade extends Command {
 				$output->writeln('<info>Checked database schema update</info>');
 			});
 			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
-				$output->writeln('<info>Disabled incompatible app: ' . $app . '</info>');
+				$output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
 			});
 			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
-				$output->writeln('<info>Disabled 3rd-party app: ' . $app . '</info>');
+				$output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>');
 			});
 			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) {
 				$output->writeln('<info>Update 3rd-party app: ' . $app . '</info>');
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 91f7fa0b25a..ffbcea0fedd 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -202,7 +202,7 @@ class LoginController extends Controller {
 				$this->throttler->sleepDelay($this->request->getRemoteAddress());
 			}
 			$this->session->set('loginMessages', [
-				['invalidpassword']
+				['invalidpassword'], []
 			]);
 			// Read current user and append if possible - we need to return the unmodified user otherwise we will leak the login name
 			$args = !is_null($user) ? ['user' => $originalUser] : [];
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
new file mode 100644
index 00000000000..8eee52096c2
--- /dev/null
+++ b/core/Controller/OCSController.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Core\Controller;
+
+use OC\CapabilitiesManager;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\IRequest;
+use OCP\IUserSession;
+
+class OCSController extends \OCP\AppFramework\OCSController {
+
+	/** @var CapabilitiesManager */
+	private $capabilitiesManager;
+
+	/** @var IUserSession */
+	private $userSession;
+
+	/**
+	 * OCSController constructor.
+	 *
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param CapabilitiesManager $capabilitiesManager
+	 * @param IUserSession $userSession
+	 */
+	public function __construct($appName,
+								IRequest $request,
+								CapabilitiesManager $capabilitiesManager,
+								IUserSession $userSession) {
+		parent::__construct($appName, $request);
+
+		$this->capabilitiesManager = $capabilitiesManager;
+		$this->userSession = $userSession;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @return DataResponse
+	 */
+	public function getCapabilities() {
+		$result = [];
+		list($major, $minor, $micro) = \OCP\Util::getVersion();
+		$result['version'] = array(
+			'major' => $major,
+			'minor' => $minor,
+			'micro' => $micro,
+			'string' => \OC_Util::getVersionString(),
+			'edition' => \OC_Util::getEditionString(),
+		);
+
+		$result['capabilities'] = $this->capabilitiesManager->getCapabilities();
+
+		return new DataResponse($result);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @return DataResponse
+	 */
+	public function getCurrentUser() {
+		$userObject = $this->userSession->getUser();
+		$data  = [
+			'id' => $userObject->getUID(),
+			'display-name' => $userObject->getDisplayName(),
+			'email' => $userObject->getEMailAddress(),
+		];
+		return new DataResponse($data);
+	}
+}
diff --git a/core/js/js.js b/core/js/js.js
index d2bbbae6362..4e8d3a01416 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1574,6 +1574,10 @@ function initCore() {
 				$target.closest('.app-navigation-noclose').length) {
 				return;
 			}
+			if($target.is('.app-navigation-entry-utils-menu-button') ||
+				$target.closest('.app-navigation-entry-utils-menu-button').length) {
+				return;
+			}
 			if($target.is('.add-new') ||
 				$target.closest('.add-new').length) {
 				return;
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index fa5c0c00986..1770bdd5a7b 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -96,6 +96,8 @@
 				this.model.saveLinkShare({
 					expireDate: ''
 				});
+			} else {
+				this.$el.find('#expirationDate').focus();
 			}
 		},
 
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 96e78831c24..35aa6c7cb20 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -219,10 +219,13 @@ OC.L10N.register(
     "Hello {name}" : "Hallo {name}",
     "new" : "neu",
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Du dieses Fenster verlässt, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.",
+    "Update to {version}" : "Aktualisierung auf {version}",
     "An error occurred." : "Es ist ein Fehler aufgetreten.",
     "Please reload the page." : "Bitte lade die Seite neu.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für weitere Informationen <a href=\"{url}\"> schaue bitte in unser Forum </a> um das Problem zu lösen.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud Community</a>.",
+    "Continue to Nextcloud" : "Weiter zur Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Das Update war erfolgreich. Weiterleitung zu Nextcloud.",
     "Searching other places" : "Andere Orte durchsuchen",
     "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index c5373cb7ebc..d50dac88d09 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -217,10 +217,13 @@
     "Hello {name}" : "Hallo {name}",
     "new" : "neu",
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Du dieses Fenster verlässt, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.",
+    "Update to {version}" : "Aktualisierung auf {version}",
     "An error occurred." : "Es ist ein Fehler aufgetreten.",
     "Please reload the page." : "Bitte lade die Seite neu.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für weitere Informationen <a href=\"{url}\"> schaue bitte in unser Forum </a> um das Problem zu lösen.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud Community</a>.",
+    "Continue to Nextcloud" : "Weiter zur Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Das Update war erfolgreich. Weiterleitung zu Nextcloud.",
     "Searching other places" : "Andere Orte durchsuchen",
     "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index bb6d29e0252..e69e4ea8046 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -219,10 +219,13 @@ OC.L10N.register(
     "Hello {name}" : "Hallo {name}",
     "new" : "Neu",
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Sie dieses Fenster verlassen, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.",
+    "Update to {version}" : "Aktualisierung auf {version}",
     "An error occurred." : "Ein Fehler ist aufgetreten.",
     "Please reload the page." : "Bitte die Seite neu laden.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für mehr Informationen <a href=\"{url}\">lesen Sie unseren Forenbeitrag</a> zu diesem Thema.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud Community</a>.",
+    "Continue to Nextcloud" : "Weiter zur Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Das Update war erfolgreich. Sie werden nun zu Nextcloud weitergeleitet.",
     "Searching other places" : "Andere Orte durchsuchen",
     "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 1920f2370e3..793659d6e07 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -217,10 +217,13 @@
     "Hello {name}" : "Hallo {name}",
     "new" : "Neu",
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Sie dieses Fenster verlassen, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.",
+    "Update to {version}" : "Aktualisierung auf {version}",
     "An error occurred." : "Ein Fehler ist aufgetreten.",
     "Please reload the page." : "Bitte die Seite neu laden.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für mehr Informationen <a href=\"{url}\">lesen Sie unseren Forenbeitrag</a> zu diesem Thema.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud Community</a>.",
+    "Continue to Nextcloud" : "Weiter zur Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Das Update war erfolgreich. Sie werden nun zu Nextcloud weitergeleitet.",
     "Searching other places" : "Andere Orte durchsuchen",
     "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 5d678bb125a..d1fc61a3ce5 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -218,10 +218,13 @@ OC.L10N.register(
     "Hello {name}" : "Halló {name}",
     "new" : "nýtt",
     "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.",
+    "Update to {version}" : "Uppfæra í {version}",
     "An error occurred." : "Villa átti sér stað.",
     "Please reload the page." : "Þú ættir að hlaða síðunni aftur inn.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar <a href=\"{url}\">skoðaðu færslu á spjallsvæðinu okkar</a> sem fjallar um þetta mál.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Uppfærslan tókst ekki. Skoðaðu annálana á kerfisstjórnunarsíðunni og sendu inn tilkynningu um vandamálið til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud samfélagsins</a>.",
+    "Continue to Nextcloud" : "Halda áfram í Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Uppfærslan heppnaðist. Beini þér til Nextcloud nú.",
     "Searching other places" : "Leitað á öðrum stöðum",
     "No search results in other folders" : "Engar leitarniðurstöður í öðrum möppum",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 79943968ebf..5236bb0faa5 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -216,10 +216,13 @@
     "Hello {name}" : "Halló {name}",
     "new" : "nýtt",
     "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.",
+    "Update to {version}" : "Uppfæra í {version}",
     "An error occurred." : "Villa átti sér stað.",
     "Please reload the page." : "Þú ættir að hlaða síðunni aftur inn.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar <a href=\"{url}\">skoðaðu færslu á spjallsvæðinu okkar</a> sem fjallar um þetta mál.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Uppfærslan tókst ekki. Skoðaðu annálana á kerfisstjórnunarsíðunni og sendu inn tilkynningu um vandamálið til <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud samfélagsins</a>.",
+    "Continue to Nextcloud" : "Halda áfram í Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Uppfærslan heppnaðist. Beini þér til Nextcloud nú.",
     "Searching other places" : "Leitað á öðrum stöðum",
     "No search results in other folders" : "Engar leitarniðurstöður í öðrum möppum",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index e02f22836d2..9ad13e835ec 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -219,10 +219,13 @@ OC.L10N.register(
     "Hello {name}" : "Ciao {name}",
     "new" : "nuovo",
     "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "L'aggiornamento è in corso, l'abbandono di questa pagina potrebbe interrompere il processo in alcuni ambienti.",
+    "Update to {version}" : "Aggiorna a {version}",
     "An error occurred." : "Si è verificato un errore.",
     "Please reload the page." : "Ricarica la pagina.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "L'aggiornamento non è riuscito. Per ulteriori informazioni <a href=\"{url}\">controlla l'articolo del nostro forum</a> che riguarda questo problema.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">comunità di Nextcloud </a>.",
+    "Continue to Nextcloud" : "Continua su Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "L'aggiornamento è stato effettuato correttamente. Reindirizzamento immediato a Nextcloud.",
     "Searching other places" : "Ricerca in altre posizioni",
     "No search results in other folders" : "Nessun risultato di ricerca in altre cartelle",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 1dd8803d534..1a106eb481b 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -217,10 +217,13 @@
     "Hello {name}" : "Ciao {name}",
     "new" : "nuovo",
     "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "L'aggiornamento è in corso, l'abbandono di questa pagina potrebbe interrompere il processo in alcuni ambienti.",
+    "Update to {version}" : "Aggiorna a {version}",
     "An error occurred." : "Si è verificato un errore.",
     "Please reload the page." : "Ricarica la pagina.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "L'aggiornamento non è riuscito. Per ulteriori informazioni <a href=\"{url}\">controlla l'articolo del nostro forum</a> che riguarda questo problema.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">comunità di Nextcloud </a>.",
+    "Continue to Nextcloud" : "Continua su Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "L'aggiornamento è stato effettuato correttamente. Reindirizzamento immediato a Nextcloud.",
     "Searching other places" : "Ricerca in altre posizioni",
     "No search results in other folders" : "Nessun risultato di ricerca in altre cartelle",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index bf3ded6efe8..24d1cbd73ff 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -219,10 +219,13 @@ OC.L10N.register(
     "Hello {name}" : "Hallo {name}",
     "new" : "nieuw",
     "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "De update is bezig, deze pagina verlaten kan het updateproces in sommige omgevingen onderbreken.",
+    "Update to {version}" : "Bijwerken naar {version}",
     "An error occurred." : "Er heeft zich een fout voorgedaan.",
     "Please reload the page." : "Herlaad deze pagina.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "De update was niet succesvol. Voor meer informatie <a href=\"{url}\">zie ons bericht op het forum</a> over dit probleem.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "De update is mislukt. Meld dit probleem aan de <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>.",
+    "Continue to Nextcloud" : "Ga door naar Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "De update is geslaagd. Je wordt nu doorgeleid naar Nextcloud.",
     "Searching other places" : "Zoeken op andere plaatsen",
     "No search results in other folders" : "Geen zoekresultaten in andere mappen",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index c6f2dce325a..57bdc633f88 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -217,10 +217,13 @@
     "Hello {name}" : "Hallo {name}",
     "new" : "nieuw",
     "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "De update is bezig, deze pagina verlaten kan het updateproces in sommige omgevingen onderbreken.",
+    "Update to {version}" : "Bijwerken naar {version}",
     "An error occurred." : "Er heeft zich een fout voorgedaan.",
     "Please reload the page." : "Herlaad deze pagina.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "De update was niet succesvol. Voor meer informatie <a href=\"{url}\">zie ons bericht op het forum</a> over dit probleem.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "De update is mislukt. Meld dit probleem aan de <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>.",
+    "Continue to Nextcloud" : "Ga door naar Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "De update is geslaagd. Je wordt nu doorgeleid naar Nextcloud.",
     "Searching other places" : "Zoeken op andere plaatsen",
     "No search results in other folders" : "Geen zoekresultaten in andere mappen",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 4bd931efc1c..2fc8c4c266f 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -219,10 +219,13 @@ OC.L10N.register(
     "Hello {name}" : "Olá {name}",
     "new" : "novo",
     "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em andamento. Se sair desta página, o processo poderá ser interrompido em alguns ambientes.",
+    "Update to {version}" : "Atualizar para {version}",
     "An error occurred." : "Ocorreu um erro.",
     "Please reload the page." : "Por favor recarregue a página",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "A atualização não foi realizada com sucesso. Para mais informações <a href=\"{url}\">verifique o nosso post no fórum</a> que abrange esta questão.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Atualizado com sucesso. Por favor, informe este problema para  a <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">comunidade Nextcloud</a>.",
+    "Continue to Nextcloud" : "Continuar no Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Atualizado com sucesso. Redirecionando para Nextcloud.",
     "Searching other places" : "Pesquisando em outros lugares",
     "No search results in other folders" : "Nenhum resultado de pesquisa em outras pastas",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 49370b740af..dc8dd37a8f4 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -217,10 +217,13 @@
     "Hello {name}" : "Olá {name}",
     "new" : "novo",
     "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em andamento. Se sair desta página, o processo poderá ser interrompido em alguns ambientes.",
+    "Update to {version}" : "Atualizar para {version}",
     "An error occurred." : "Ocorreu um erro.",
     "Please reload the page." : "Por favor recarregue a página",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "A atualização não foi realizada com sucesso. Para mais informações <a href=\"{url}\">verifique o nosso post no fórum</a> que abrange esta questão.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Atualizado com sucesso. Por favor, informe este problema para  a <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">comunidade Nextcloud</a>.",
+    "Continue to Nextcloud" : "Continuar no Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Atualizado com sucesso. Redirecionando para Nextcloud.",
     "Searching other places" : "Pesquisando em outros lugares",
     "No search results in other folders" : "Nenhum resultado de pesquisa em outras pastas",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 92246d344fa..15cc8d0ed5a 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -219,10 +219,13 @@ OC.L10N.register(
     "Hello {name}" : "Здравствуйте {name}",
     "new" : "новый",
     "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов","скачать %n файлов"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Идет обновление, покидая эту страницу, вы можете прервать процесс в некоторых окружениях.",
+    "Update to {version}" : "Обновление до {version}",
     "An error occurred." : "Произошла ошибка.",
     "Please reload the page." : "Пожалуйста, обновите страницу.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. Больше информации  о данной проблеме можно найти <a href=\"{url}\">в сообщении на нащем форуме</a>.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Обновление не удалось. Пожалуйста, сообщите об этой проблеме <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">сообществу Nextcloud</a>.",
+    "Continue to Nextcloud" : "Продолжить в Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Обновление прошло успешно. Перенаправляем вас на Nextcloud прямо сейчас.",
     "Searching other places" : "Идет поиск в других местах",
     "No search results in other folders" : "В других папках ничего не найдено",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index a22f6640946..1f7d61f1fe3 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -217,10 +217,13 @@
     "Hello {name}" : "Здравствуйте {name}",
     "new" : "новый",
     "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов","скачать %n файлов"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Идет обновление, покидая эту страницу, вы можете прервать процесс в некоторых окружениях.",
+    "Update to {version}" : "Обновление до {version}",
     "An error occurred." : "Произошла ошибка.",
     "Please reload the page." : "Пожалуйста, обновите страницу.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. Больше информации  о данной проблеме можно найти <a href=\"{url}\">в сообщении на нащем форуме</a>.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Обновление не удалось. Пожалуйста, сообщите об этой проблеме <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">сообществу Nextcloud</a>.",
+    "Continue to Nextcloud" : "Продолжить в Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Обновление прошло успешно. Перенаправляем вас на Nextcloud прямо сейчас.",
     "Searching other places" : "Идет поиск в других местах",
     "No search results in other folders" : "В других папках ничего не найдено",
diff --git a/core/routes.php b/core/routes.php
index 98454946d45..b4868c14cf3 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -53,6 +53,10 @@ $application->registerRoutes($this, [
 		['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
 		['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
 	],
+	'ocs' => [
+		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
+		['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
+	],
 ]);
 
 // Post installation check