From 151708c4b56306708524e0548fcbc0a1b33e5c42 Mon Sep 17 00:00:00 2001 From: sofietoft Date: Tue, 22 Nov 2022 15:37:15 +0100 Subject: [PATCH 1/9] Updated docs links to point to new platform (#13426) * Updated docs links to point to new platform * Update settingsdashboardintro.html Co-authored-by: nikolajlauridsen --- .github/README.md | 2 +- src/Umbraco.Core/EmbeddedResources/Lang/cs.xml | 8 ++++---- src/Umbraco.Core/EmbeddedResources/Lang/cy.xml | 6 +++--- src/Umbraco.Core/EmbeddedResources/Lang/da.xml | 4 ++-- src/Umbraco.Core/EmbeddedResources/Lang/de.xml | 4 ++-- src/Umbraco.Core/EmbeddedResources/Lang/en.xml | 8 ++++---- src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml | 8 ++++---- src/Umbraco.Core/EmbeddedResources/Lang/es.xml | 4 ++-- src/Umbraco.Core/EmbeddedResources/Lang/fr.xml | 6 +++--- src/Umbraco.Core/EmbeddedResources/Lang/he.xml | 2 +- src/Umbraco.Core/EmbeddedResources/Lang/it.xml | 8 ++++---- src/Umbraco.Core/EmbeddedResources/Lang/ja.xml | 2 +- src/Umbraco.Core/EmbeddedResources/Lang/ko.xml | 2 +- src/Umbraco.Core/EmbeddedResources/Lang/nb.xml | 2 +- src/Umbraco.Core/EmbeddedResources/Lang/nl.xml | 8 ++++---- src/Umbraco.Core/EmbeddedResources/Lang/pl.xml | 4 ++-- src/Umbraco.Core/EmbeddedResources/Lang/pt.xml | 2 +- src/Umbraco.Core/EmbeddedResources/Lang/ru.xml | 4 ++-- src/Umbraco.Core/EmbeddedResources/Lang/sv.xml | 2 +- src/Umbraco.Core/EmbeddedResources/Lang/tr.xml | 8 ++++---- src/Umbraco.Core/EmbeddedResources/Lang/zh.xml | 4 ++-- src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml | 4 ++-- .../Extensions/BlockGridTemplateExtensions.cs | 2 +- .../src/installer/steps/permissionsreport.html | 2 +- .../src/views/dashboard/dashboard.tabs.controller.js | 2 +- .../src/views/dashboard/settings/healthcheck.html | 2 +- .../views/dashboard/settings/settingsdashboardintro.html | 2 +- 27 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/README.md b/.github/README.md index 5fa412cae4..3ed117a8bd 100644 --- a/.github/README.md +++ b/.github/README.md @@ -25,7 +25,7 @@ If you want to DIY, then you can [download Umbraco]((https://our.umbraco.com/dow ## Documentation -The documentation for Umbraco CMS can be found [on Our Umbraco](https://our.umbraco.com/documentation/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions. +The documentation for Umbraco CMS can be found [on Our Umbraco](https://docs.umbraco.com/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions. ## Join the Umbraco community diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml index 0057d3d9a6..09c679475d 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml @@ -2,7 +2,7 @@ Umbraco komunita - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Kultura a názvy hostitelů @@ -254,7 +254,7 @@ Podřízené položky Cíl This translates to the following time on the server: - What does this mean?]]> + What does this mean?]]> Are you sure you want to delete this item? Are you sure you want to delete all items? Property %0% uses editor %1% which is not supported by Nested Content. @@ -1956,7 +1956,7 @@ Zkontrolovat skupinu Kontrola vyhodnocuje různé oblasti vašeho webu z hlediska nastavení osvědčených postupů, konfigurace, potenciálních problémů atd. Problémy lze snadno vyřešit stisknutím tlačítka. Můžete přidat své vlastní kontroly, podívejte se na dokumentaci pro více informací o vlastních kontrolách.

+

Kontrola vyhodnocuje různé oblasti vašeho webu z hlediska nastavení osvědčených postupů, konfigurace, potenciálních problémů atd. Problémy lze snadno vyřešit stisknutím tlačítka. Můžete přidat své vlastní kontroly, podívejte se na dokumentaci pro více informací o vlastních kontrolách.

]]> @@ -2152,7 +2152,7 @@ Zjistit více v sekci Dokumentace v Our Umbraco + Další informace o práci s položkami naleznete v části Nastavení v sekci Dokumentace v Our Umbraco ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml index 012a1bc0b9..ba77f76f81 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml @@ -273,7 +273,7 @@ Eitemau blentyn Targed Mae hyn yn trawsnewid at yr amser ganlynol ar y gweinydd: - Beth mae hyn yn golygu?]]> + Beth mae hyn yn golygu?]]> Ydych chi'n sicr eich bod eisiau dileu'r eitem yma? Mae'r priodwedd %0% yn defnyddio'r golygydd %1% sydd ddim yn cyd-fynd â Chynnwys Amnyth. Wyt ti'n siŵr fod ti eisiau dileu pob eitem? @@ -2459,7 +2459,7 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang Mae'r gwiriwr iechyd yn gwerthuso gwahanol rannau o'ch gwefan ar gyfer gosodiadau arfer gorau, cyfluniad, problemau posibl, ac ati. Gallwch chi drwsio problemau yn hawdd trwy wasgu botwm. - Gallwch chi ychwanegu eich gwiriadau iechyd eich hun, edrych ar y ddogfennaeth i gael mwy o wybodaeth am wiriadau iechyd arferu.

+ Gallwch chi ychwanegu eich gwiriadau iechyd eich hun, edrych ar y ddogfennaeth i gael mwy o wybodaeth am wiriadau iechyd arferu.

]]> Eich wefan gallu defnyddio y protocol gwarchodaeth TLS 1.2 wrth wneud cysylltiadau allanol i endpoints HTTPS @@ -2737,7 +2737,7 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang Ddarganfod fwy fewn yr adran Dogfennaeth o Our Umbraco + Darllenwch fwy am weithio efo'r eitemau yn yr adran Gosodiadau fewn yr adran Dogfennaeth o Our Umbraco ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml index 7fbc7d0b5b..0555ea3934 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Tilføj domæne @@ -275,7 +275,7 @@ Åben i vindue Dette oversætter til den følgende tid på serveren: - Hvad betyder det?]]> + Hvad betyder det?]]> Er du sikker på, at du vil slette dette element? Er du sikker på, at du vil slette alle elementer? Egenskaben %0% anvender editoren %1% som ikke er understøttet af Nested diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml index 448453778b..582b62baf2 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Kulturen und Hostnamen @@ -258,7 +258,7 @@ Dies führt zur folgenden Zeit auf dem Server: Was bedeutet dies? + Was bedeutet dies? ]]> Wollen Sie dieses Element wirklich entfernen? diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index 941ac9d8a0..4d873076c9 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Culture and Hostnames @@ -273,7 +273,7 @@ Target This translates to the following time on the server: - What does this mean?]]> + What does this mean?]]> Are you sure you want to delete this item? Property %0% uses editor %1% which is not supported by Nested Content. @@ -2377,7 +2377,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. - You can add your own health checks, have a look at the documentation for more information about custom health checks.

+ You can add your own health checks, have a look at the documentation for more information about custom health checks.

]]> @@ -2666,7 +2666,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Find out more in the Documentation section of Our Umbraco + Read more about working with the items in Settings in the Documentation section of Our Umbraco ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index 64694dd053..b0f46f7b5c 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Culture and Hostnames @@ -277,7 +277,7 @@ Target This translates to the following time on the server: - What does this mean?]]> + What does this mean?]]> Are you sure you want to delete this item? Are you sure you want to delete all items? Property %0% uses editor %1% which is not supported by Nested @@ -2479,7 +2479,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. - You can add your own health checks, have a look at the documentation for more information about custom health checks.

+ You can add your own health checks, have a look at the documentation for more information about custom health checks.

]]> @@ -2768,7 +2768,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Find out more in the Documentation section of Our Umbraco + Read more about working with the items in Settings in the Documentation section of Our Umbraco ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml index 4a111302b3..b2ab390a2e 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Administrar dominios @@ -190,7 +190,7 @@ Nodos hijo Destino Esto se traduce en la siguiente hora en el servidor: - ¿Esto qué significa?]]> + ¿Esto qué significa?]]> ¿Estás seguro que quieres eliminar este elemento? Propiedad %0% utiliza editor %1% que no está soportado por Nested Content. Añadir otra caja de texto diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml index 384981e467..1576cedbe4 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Culture et noms d'hôte @@ -252,7 +252,7 @@ Eléments enfants Cible Ceci se traduit par l'heure suivante sur le serveur : - Qu'est-ce que cela signifie?]]> + Qu'est-ce que cela signifie?]]> Etes-vous certain(e) de vouloir supprimer cet élément? Etes-vous certain(e) de vouloir supprimer tous les éléments? La propriété %0% utilise l'éditeur %1% qui n'est pas supporté par Nested Content. @@ -2203,7 +2203,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à En savoir plus dans la section Documentation de Our Umbraco + Lisez-en plus sur la façon de travailler avec les éléments dans la section Settings dans la section Documentation de Our Umbraco ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml index 819e71aec9..f0427bbae1 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files נהל שמות מתחם diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml index c85274b80f..2430542e66 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Gestisci hostnames @@ -280,7 +280,7 @@ Target Questo si traduce nella seguente ora sul server: - Cosa significa questo?]]> + Cosa significa questo?]]> Sei sicuro di voler eliminare questo oggetto? Sei sicuro di voler eliminare tutti gli oggetti? @@ -2526,7 +2526,7 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in L'health checker valuta varie aree del tuo sito per le impostazioni delle migliori pratiche, la configurazione, i potenziali problemi, ecc. Puoi facilmente risolvere i problemi premendo un pulsante. - Puoi aggiungere i tuoi health check personalizzati, guarda sulla documentazione per più informazioni riguardo i custom health checks.

+ Puoi aggiungere i tuoi health check personalizzati, guarda sulla documentazione per più informazioni riguardo i custom health checks.

]]> @@ -2810,7 +2810,7 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in nella documentazione di Our Umbraco + Maggiori informazioni su come lavorare con gli elementi in Impostazioni nella documentazione di Our Umbraco ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml index 28d512973f..9a94e7d924 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files ドメインの割り当て diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml index dfe848387c..4aa0d4ad89 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files 호스트명 관리 diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml index c19aa1df4f..c2784b3a9c 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Angi domene diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml index debfd51023..dd1fbfbad6 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Beheer domeinnamen @@ -274,7 +274,7 @@ Doel Dit betekend de volgende tijd op de server: - Wat houd dit in?]]> + Wat houd dit in?]]> Ben je er zeker van dat je dit item wilt verwijderen? Ben je zeker dat je alle items wilt verwijderen? Eigenschap %0% gebruikt editor %1% welke niet wordt ondersteund door @@ -2174,7 +2174,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je De health checker evalueert verschillende delen van de website voor best practice instellingen, configuratie, mogelijke problemen, enzovoort. U kunt problemen eenvoudig oplossen met een druk op de knop. - U kunt uw eigen health checks toevoegen, kijk even naar de documentatie voor meer informatie over aangepaste health checks.

+ U kunt uw eigen health checks toevoegen, kijk even naar de documentatie voor meer informatie over aangepaste health checks.

]]> @@ -2429,7 +2429,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Meer te weten komen in het Documentatiegedeelte van Our Umbraco + Lees meer over het werken met de items in de sectie Instellingen in het Documentatiegedeelte van Our Umbraco ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml index a4d891fd8f..53aa716792 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Zarządzanie hostami @@ -184,7 +184,7 @@ Elementy dzieci Cel Oznacza to następującą godzinę na serwerze: - Co to oznacza?]]> + Co to oznacza?]]> Czy na pewno chcesz usunąć ten element? Właściwość %0% używa edytora %1%, który nie jest wspierany przez Nested Content. Dodaj kolejne pole tekstowe diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml index b5fd920365..f6cdb21208 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Gerenciar hostnames diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml index f83dd5285c..39be7570a3 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Языки и домены @@ -218,7 +218,7 @@ Очистить дату ВНИМАНИЕ: этот документ опубликован, но его URL вступает в противоречие с документом %0% Это время будет соответствовать следующему времени на сервере: - Что это означает?]]> + Что это означает?]]> Задать дату Порядок сортировки обновлен Для сортировки узлов просто перетаскивайте узлы или нажмите на заголовке столбца. Вы можете выбрать несколько узлов, удерживая клавиши "shift" или "ctrl" при пометке diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml index e2e7cbcd76..c0a90e1dbb 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Innehåll diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml index 30a38ba6c7..1195378516 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files Kültür ve Ana Bilgisayar Adları @@ -257,7 +257,7 @@ Alt öğeler Hedef Bu, sunucuda şu zamana çevrilir: - Ne bu ne anlama geliyor? ]]> + Ne bu ne anlama geliyor? ]]> Bu öğeyi silmek istediğinizden emin misiniz? %0% özelliği,%1% düzenleyiciyi kullanıyor ve bu, Yuvalanmış İçerik tarafından desteklenmiyor. Tüm öğeleri silmek istediğinizden emin misiniz? @@ -2085,7 +2085,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey Durum denetleyicisi, sitenizin çeşitli alanlarını en iyi uygulama ayarları, yapılandırma, olası sorunlar vb. için değerlendirir. Sorunları bir düğmeye basarak kolayca düzeltebilirsiniz. - Kendi sağlık kontrollerinizi ekleyebilir, özel durum kontrolleri hakkında daha fazla bilgi için belgeler .

+ Kendi sağlık kontrollerinizi ekleyebilir, özel durum kontrolleri hakkında daha fazla bilgi için belgeler .

]]> @@ -2314,7 +2314,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey Daha fazla bilgi edinin öğelerle çalışma hakkında daha fazla bilgi edinin Our Umbraco'nun Dokümantasyon bölümünde + Ayarlar öğelerle çalışma hakkında daha fazla bilgi edinin Our Umbraco'nun Dokümantasyon bölümünde ]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml b/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml index 199b185ed3..83ea263a97 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml @@ -2,7 +2,7 @@ 黄仁祥(wanddy@163.com) - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files 管理主机名 @@ -147,7 +147,7 @@ 子项 目标 这将转换到服务器上的以下时间: - 这是什么意思？]]> + 这是什么意思？]]> 点击上传 diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml b/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml index d57c1c614d..d334178766 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files + https://docs.umbraco.com/umbraco-cms/extending/language-files 管理主機名稱 @@ -145,7 +145,7 @@ 子項目 目標 預計發表的時間（伺服器端） - 這是什麼意思？]]> + 這是什麼意思？]]> 點選以便上傳 diff --git a/src/Umbraco.Web.Common/Extensions/BlockGridTemplateExtensions.cs b/src/Umbraco.Web.Common/Extensions/BlockGridTemplateExtensions.cs index 5951c6e009..e5b4063435 100644 --- a/src/Umbraco.Web.Common/Extensions/BlockGridTemplateExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/BlockGridTemplateExtensions.cs @@ -30,7 +30,7 @@ public static class BlockGridTemplateExtensions /// The partial views are found in "/src/Umbraco.Cms.StaticAssets/Views/Partials/blockgrid/" on GitHub and should /// be copied to "Views/Partials/BlockGrid/" on your local disk. /// - /// + /// public static async Task GetBlockGridHtmlAsync(this IHtmlHelper html, BlockGridModel? model, string template = DefaultTemplate) { if (model?.Count == 0) diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html index 366f8b9d19..f3067e8fb6 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html @@ -3,7 +3,7 @@

In order to run Umbraco, you'll need to update your permission settings. Detailed information about the correct file and folder permissions for Umbraco can be found - here. + here.

The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation. diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index e08451f261..b7c07f48a7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -48,7 +48,7 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource { title: "Documentation", description: "Find the answers to your Umbraco questions", - url: "https://our.umbraco.com/documentation/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=documentation/" + url: "https://docs.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=documentation/" }, { title: "Community", diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html index 0b60cd2433..fa68bdc833 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html @@ -7,7 +7,7 @@

The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. - You can add your own health checks, have a look at the documentation for more information about custom health checks.

+ You can add your own health checks, have a look at the documentation for more information about custom health checks.
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html index b33444177a..93fe6c0cbd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html @@ -11,7 +11,7 @@
  • - Read more about working with the items in Settings in the Documentation section of Our Umbraco + Read more about working with the items in Settings in the Umbraco Documentation.
  • Ask a question in the Community Forum From f017c27db8db5e830aea9fa8b7dec98c30685170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 13 Dec 2022 09:34:18 +0100 Subject: [PATCH 2/9] fix the broken responsiveness css calculation (#13535) --- .../propertyeditors/blockgrid/umbraco-blockgridlayout.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css index 60e0c4e96a..4765c9c45e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css @@ -29,7 +29,7 @@ .umb-block-grid__area { position: relative; /* For small devices we scale columnSpan by three, to make everything bigger than 1/3 take full width: */ - grid-column-end: span min(calc(var(--umb-block-grid--area-column-span, 1) * 3), var(--umb-block-grid--grid-columns)); + grid-column-end: span min(calc(var(--umb-block-grid--area-column-span, 1) * 3), var(--umb-block-grid--area-grid-columns)); grid-row: span var(--umb-block-grid--area-row-span, 1); } @@ -38,6 +38,6 @@ grid-column-end: span min(var(--umb-block-grid--item-column-span, 1), var(--umb-block-grid--grid-columns)); } .umb-block-grid__area { - grid-column-end: span var(--umb-block-grid--area-column-span, 1); + grid-column-end: span min(var(--umb-block-grid--area-column-span, 1), var(--umb-block-grid--area-grid-columns)); } } \ No newline at end of file From e4d1c65081c5b0b136600c01db5cdd6cf510502f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 13 Dec 2022 09:35:34 +0100 Subject: [PATCH 3/9] Make our default layout stylesheet handle area as flexbox, similar to backoffice styling. (#13534) --- .../blockgrid/umbraco-blockgridlayout-flexbox.css | 3 +++ .../propertyeditors/blockgrid/umbraco-blockgridlayout.css | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css index 5dcc95a61d..7c37c48f0d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css @@ -22,6 +22,9 @@ } .umb-block-grid__area { position: relative; + height: 100%; + display: flex; + flex-direction: column; --umb-block-grid__area-calc: calc(var(--umb-block-grid--area-column-span) / var(--umb-block-grid--area-grid-columns, 1)); width: calc(var(--umb-block-grid__area-calc) * 100% - (1 - var(--umb-block-grid__area-calc)) * var(--umb-block-grid--areas-column-gap, 0px)); } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css index 4765c9c45e..8a4f567cac 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css @@ -28,6 +28,9 @@ } .umb-block-grid__area { position: relative; + height: 100%; + display: flex; + flex-direction: column; /* For small devices we scale columnSpan by three, to make everything bigger than 1/3 take full width: */ grid-column-end: span min(calc(var(--umb-block-grid--area-column-span, 1) * 3), var(--umb-block-grid--area-grid-columns)); grid-row: span var(--umb-block-grid--area-row-span, 1); From 0b9e90821ee66654d5a14bbae526f00aacc57366 Mon Sep 17 00:00:00 2001 From: Michael Latouche Date: Fri, 21 Oct 2022 19:40:00 +0200 Subject: [PATCH 4/9] Update datepicker.controller.js Don't set dirty if date actually not changed (cherry picked from commit 92ac072559191a1703e35d788334a87c7b450ead) --- .../datepicker/datepicker.controller.js | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 0cb8c0699c..de0602342c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -143,26 +143,29 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM } function updateModelValue(momentDate) { - if ($scope.hasDatetimePickerValue) { - if ($scope.model.config.pickTime) { - //check if we are supposed to offset the time - if ($scope.model.value && Object.toBoolean($scope.model.config.offsetTime) && Umbraco.Sys.ServerVariables.application.serverTimeOffset !== undefined) { - $scope.model.value = dateHelper.convertToServerStringTime(momentDate, Umbraco.Sys.ServerVariables.application.serverTimeOffset); - $scope.serverTime = dateHelper.convertToServerStringTime(momentDate, Umbraco.Sys.ServerVariables.application.serverTimeOffset, "YYYY-MM-DD HH:mm:ss Z"); - } - else { - $scope.model.value = momentDate.format("YYYY-MM-DD HH:mm:ss"); - } - } - else { - $scope.model.value = momentDate.format("YYYY-MM-DD"); - } + var curMoment = moment($scope.model.value); + if ($scope.hasDatetimePickerValue) { + if ($scope.model.config.pickTime) { + //check if we are supposed to offset the time + if ($scope.model.value && Object.toBoolean($scope.model.config.offsetTime) && Umbraco.Sys.ServerVariables.application.serverTimeOffset !== undefined) { + $scope.model.value = dateHelper.convertToServerStringTime(momentDate, Umbraco.Sys.ServerVariables.application.serverTimeOffset); + $scope.serverTime = dateHelper.convertToServerStringTime(momentDate, Umbraco.Sys.ServerVariables.application.serverTimeOffset, "YYYY-MM-DD HH:mm:ss Z"); + } + else { + $scope.model.value = momentDate.format("YYYY-MM-DD HH:mm:ss"); + } } else { - $scope.model.value = null; + $scope.model.value = momentDate.format("YYYY-MM-DD"); } + } + else { + $scope.model.value = null; + } + if (!curMoment.isSame(momentDate)) { setDirty(); + } } function setDirty() { From 5d0d245f6984018bfea06fd32c8c074dc281d8a2 Mon Sep 17 00:00:00 2001 From: Rachel Breeze Date: Sun, 23 Oct 2022 12:48:05 +0100 Subject: [PATCH 5/9] A11Y added missing iframe title to installer and preview controller. (cherry picked from commit d32b93349d65705cff1936ab160b9bd4ea43b7cd) --- .../umbraco/UmbracoInstall/Index.cshtml | 2 +- src/Umbraco.Web.UI.Client/src/preview/preview.controller.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml index be1b741535..68049c6c91 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml @@ -35,7 +35,7 @@

    A server error occurred

    This is most likely due to an error during application startup

    - +
    diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js index 3933237ad7..d16d9b5b4d 100644 --- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js @@ -455,6 +455,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi $scope.onFrameLoaded = function (iframe) { + iframe.title = "Page preview"; $scope.frameLoaded = true; configureSignalR(iframe); fixExternalLinks(iframe); From 90fdd8c5a8e2248ec65fdbab947afb5b029ef0ca Mon Sep 17 00:00:00 2001 From: Tiffany Date: Sat, 22 Oct 2022 17:05:55 +0100 Subject: [PATCH 6/9] Added h2 for the package details heading (cherry picked from commit 96da6382368b338ca594557cfe6e96db75fa7617) # Conflicts: # src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html --- src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html index fe386a9550..257f075811 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html @@ -171,7 +171,7 @@ -
    {{ vm.package.name }}
    +

    {{ vm.package.name }}

    From faa256dd923bf4aa9ff72f2df981485b5d0994cf Mon Sep 17 00:00:00 2001 From: BatJan <1932158+BatJan@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:36:11 +0200 Subject: [PATCH 7/9] Change prevalue order (cherry picked from commit 8fe699f26b890d81cc118fa9f543a762622eab2e) --- src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs index 13f423a328..6b44d4ba56 100644 --- a/src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs +++ b/src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs @@ -54,9 +54,6 @@ public class ListViewConfiguration [ConfigurationField("pageSize", "Page Size", "number", Description = "Number of items per page")] public int PageSize { get; set; } - [ConfigurationField("orderBy", "Order By", "views/propertyeditors/listview/sortby.prevalues.html", Description = "The default sort order for the list")] - public string OrderBy { get; set; } - [ConfigurationField("orderDirection", "Order Direction", "views/propertyeditors/listview/orderDirection.prevalues.html")] public string OrderDirection { get; set; } @@ -67,6 +64,9 @@ public class ListViewConfiguration Description = "The properties that will be displayed for each column")] public Property[] IncludeProperties { get; set; } + [ConfigurationField("orderBy", "Order By", "views/propertyeditors/listview/sortby.prevalues.html", Description = "The default sort order for the list")] + public string OrderBy { get; set; } + [ConfigurationField("layouts", "Layouts", "views/propertyeditors/listview/layouts.prevalues.html")] public Layout[] Layouts { get; set; } From fd7778320a9694c83bb638b18da002d7189b7460 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Tue, 13 Dec 2022 13:32:14 +0100 Subject: [PATCH 8/9] Save using consistent newline and support parsing different newlines (#13569) --- .../MultipleTextStringPropertyEditor.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringPropertyEditor.cs index 4f25a54162..e21d43e996 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringPropertyEditor.cs @@ -68,6 +68,9 @@ public class MultipleTextStringPropertyEditor : DataEditor /// internal class MultipleTextStringPropertyValueEditor : DataValueEditor { + private static readonly string NewLine = "\n"; + private static readonly string[] NewLineDelimiters = { "\r\n", "\r", "\n" }; + private readonly ILocalizedTextService _localizedTextService; public MultipleTextStringPropertyValueEditor( @@ -119,10 +122,10 @@ public class MultipleTextStringPropertyEditor : DataEditor // only allow the max if over 0 if (max > 0) { - return string.Join(Environment.NewLine, array.Take(max)); + return string.Join(NewLine, array.Take(max)); } - return string.Join(Environment.NewLine, array); + return string.Join(NewLine, array); } /// @@ -131,7 +134,6 @@ public class MultipleTextStringPropertyEditor : DataEditor /// cannot have 2 way binding, so to get around that each item in the array needs to be an object with a string. /// /// - /// /// /// /// @@ -141,8 +143,9 @@ public class MultipleTextStringPropertyEditor : DataEditor public override object ToEditor(IProperty property, string? culture = null, string? segment = null) { var val = property.GetValue(culture, segment); - return val?.ToString()?.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries) - .Select(x => JObject.FromObject(new { value = x })) ?? new JObject[] { }; + + return val?.ToString()?.Split(NewLineDelimiters, StringSplitOptions.None).Select(x => JObject.FromObject(new { value = x })) + ?? Array.Empty(); } } From 2d564a11b97f099aef643244bfb9664b9880eca2 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 14 Dec 2022 08:14:19 +0100 Subject: [PATCH 9/9] Maintenance page when in upgrade state (#13551) * Added functionality to show maintenance page and fixed issues with showing custom api controllers and 404 page, when umbraco had been in install or upgrade state * Fixed Tests * Fixed typo * Fixed issue with login screen redirecting to website when in upgrade state, instead of backoffice --- .../umbraco/UmbracoWebsite/Maintenance.cshtml | 69 +++++++++++++++++++ .../Configuration/Models/GlobalSettings.cs | 4 ++ .../Controllers/BackOfficeController.cs | 8 +++ .../Install/InstallAreaRoutes.cs | 20 ++---- .../ActionsResults/MaintenanceResult.cs | 27 ++++++++ .../Authorization/FeatureAuthorizeHandler.cs | 23 ++++++- .../MaintenanceModeActionFilterAttribute.cs | 42 +++++++++++ .../Controllers/RenderController.cs | 1 + .../Middleware/UmbracoRequestMiddleware.cs | 3 +- .../Routing/FrontEndRoutes.cs | 17 +++-- .../Routing/UmbracoRouteValueTransformer.cs | 16 ++++- .../Routing/InstallAreaRoutesTests.cs | 16 +++-- 12 files changed, 217 insertions(+), 29 deletions(-) create mode 100644 src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml create mode 100644 src/Umbraco.Web.Common/ActionsResults/MaintenanceResult.cs create mode 100644 src/Umbraco.Web.Common/Controllers/MaintenanceModeActionFilterAttribute.cs diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml new file mode 100644 index 0000000000..46739cdef7 --- /dev/null +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml @@ -0,0 +1,69 @@ +@using Microsoft.Extensions.Options +@using Umbraco.Cms.Core.Configuration.Models +@using Umbraco.Cms.Core.Hosting +@using Umbraco.Cms.Core.Routing +@using Umbraco.Extensions +@inject IHostingEnvironment hostingEnvironment +@inject IOptions globalSettings +@{ + var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment); +} + + + + + + + + Website is Under Maintainance + + + + + + +
    +
    +
    +

    Website is Under Maintenance

    + +
    + +
    +
    +

    This page can be replaced

    +

    + Custom error handling might make your site look more on-brand and minimize the impact of errors on user experience - for example, a custom 404 with some helpful links (or a search function) could bring some value to the site. +

    + + Implementing custom error pages → +
    + +
    +

    Finish the maintenance

    +

    If you are an administrator, you finish the maintanance by going to backoffice.

    + + Handle the upgrade → +
    +
    + +
    +
    + +
    + + + diff --git a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs index 92c443fd77..7631f243c8 100644 --- a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs @@ -33,6 +33,7 @@ public class GlobalSettings internal const bool StaticSanitizeTinyMce = false; internal const int StaticMainDomReleaseSignalPollingInterval = 2000; private const bool StaticForceCombineUrlPathLeftToRight = true; + private const bool StaticShowMaintenancePageWhenInUpgradeState = true; /// /// Gets or sets a value for the reserved URLs (must end with a comma). @@ -252,4 +253,7 @@ public class GlobalSettings /// [DefaultValue(StaticForceCombineUrlPathLeftToRight)] public bool ForceCombineUrlPathLeftToRight { get; set; } = StaticForceCombineUrlPathLeftToRight; + + [DefaultValue(StaticShowMaintenancePageWhenInUpgradeState)] + public bool ShowMaintenancePageWhenInUpgradeState { get; set; } = StaticShowMaintenancePageWhenInUpgradeState; } diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs index c5567d1796..f8d579e952 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -120,6 +121,13 @@ public class BackOfficeController : UmbracoController // Check if we not are in an run state, if so we need to redirect if (_runtimeState.Level != RuntimeLevel.Run) { + if (_runtimeState.Level == RuntimeLevel.Upgrade) + { + return RedirectToAction(nameof(AuthorizeUpgrade), routeValues: new RouteValueDictionary() + { + ["redir"] = _globalSettings.GetBackOfficePath(_hostingEnvironment), + }); + } return Redirect("/"); } diff --git a/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs b/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs index 0ea55d861d..4e65aaef0f 100644 --- a/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs +++ b/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; @@ -28,23 +29,12 @@ public class InstallAreaRoutes : IAreaRoutes switch (_runtime.Level) { - case var _ when _runtime.EnableInstaller(): + case RuntimeLevel.Install: + case RuntimeLevel.Upgrade: + case RuntimeLevel.Run: + endpoints.MapUmbracoRoute(installPathSegment, Constants.Web.Mvc.InstallArea, "api", includeControllerNameInRoute: false); endpoints.MapUmbracoRoute(installPathSegment, Constants.Web.Mvc.InstallArea, string.Empty, includeControllerNameInRoute: false); - - // register catch all because if we are in install/upgrade mode then we'll catch everything - endpoints.MapFallbackToAreaController(nameof(InstallController.Index), ControllerExtensions.GetControllerName(), Constants.Web.Mvc.InstallArea); - - break; - case RuntimeLevel.Run: - // when we are in run mode redirect to the back office if the installer endpoint is hit - endpoints.MapGet($"{installPathSegment}/{{controller?}}/{{action?}}", context => - { - // redirect to umbraco - context.Response.Redirect(_linkGenerator.GetBackOfficeUrl(_hostingEnvironment)!, false); - return Task.CompletedTask; - }); - break; case RuntimeLevel.BootFailed: case RuntimeLevel.Unknown: diff --git a/src/Umbraco.Web.Common/ActionsResults/MaintenanceResult.cs b/src/Umbraco.Web.Common/ActionsResults/MaintenanceResult.cs new file mode 100644 index 0000000000..6e27321f00 --- /dev/null +++ b/src/Umbraco.Web.Common/ActionsResults/MaintenanceResult.cs @@ -0,0 +1,27 @@ +using System.Net; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Umbraco.Cms.Core.Routing; +using Umbraco.Cms.Core.Web; + +namespace Umbraco.Cms.Web.Common.ActionsResults; + +/// +/// Returns the Umbraco maintenance result +/// +public class MaintenanceResult : IActionResult +{ + /// + public async Task ExecuteResultAsync(ActionContext context) + { + HttpResponse response = context.HttpContext.Response; + + response.Clear(); + + response.StatusCode = StatusCodes.Status503ServiceUnavailable; + + var viewResult = new ViewResult { ViewName = "~/umbraco/UmbracoWebsite/Maintenance.cshtml" }; + + await viewResult.ExecuteResultAsync(context); + } +} diff --git a/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs b/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs index 485208064d..596cba7f3d 100644 --- a/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs +++ b/src/Umbraco.Web.Common/Authorization/FeatureAuthorizeHandler.cs @@ -3,7 +3,11 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.Extensions.DependencyInjection; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Features; +using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.DependencyInjection; namespace Umbraco.Cms.Web.Common.Authorization; @@ -13,8 +17,20 @@ namespace Umbraco.Cms.Web.Common.Authorization; public class FeatureAuthorizeHandler : AuthorizationHandler { private readonly UmbracoFeatures _umbracoFeatures; + private readonly IRuntimeState _runtimeState; - public FeatureAuthorizeHandler(UmbracoFeatures umbracoFeatures) => _umbracoFeatures = umbracoFeatures; + public FeatureAuthorizeHandler(UmbracoFeatures umbracoFeatures, IRuntimeState runtimeState) + { + _umbracoFeatures = umbracoFeatures; + _runtimeState = runtimeState; + } + + [Obsolete("Use ctor that is not obsolete. This will be removed in v13.")] + public FeatureAuthorizeHandler(UmbracoFeatures umbracoFeatures) + :this(umbracoFeatures, StaticServiceProvider.Instance.GetRequiredService()) + { + + } protected override Task HandleRequirementAsync( AuthorizationHandlerContext context, @@ -35,6 +51,11 @@ public class FeatureAuthorizeHandler : AuthorizationHandler _globalSettings; + + public MaintenanceModeActionFilter(IRuntimeState runtimeState, IOptionsMonitor globalSettings) + { + _runtimeState = runtimeState; + _globalSettings = globalSettings; + } + + public void OnActionExecuting(ActionExecutingContext context) + { + if (_runtimeState.Level == RuntimeLevel.Upgrade && _globalSettings.CurrentValue.ShowMaintenancePageWhenInUpgradeState) + { + context.Result = new MaintenanceResult(); + } + + } + + public void OnActionExecuted(ActionExecutedContext context) + { + + } + } +} diff --git a/src/Umbraco.Web.Common/Controllers/RenderController.cs b/src/Umbraco.Web.Common/Controllers/RenderController.cs index a9771c0ab8..dad8d8a84b 100644 --- a/src/Umbraco.Web.Common/Controllers/RenderController.cs +++ b/src/Umbraco.Web.Common/Controllers/RenderController.cs @@ -16,6 +16,7 @@ namespace Umbraco.Cms.Web.Common.Controllers; /// [ModelBindingException] [PublishedRequestFilter] +[MaintenanceModeActionFilter] public class RenderController : UmbracoPageController, IRenderController { private readonly ILogger _logger; diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs index cf73ba481c..b470b66752 100644 --- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs @@ -216,7 +216,8 @@ public class UmbracoRequestMiddleware : IMiddleware if (_umbracoRequestPaths.IsBackOfficeRequest(absPath) || (absPath.Value?.InvariantStartsWith($"/{_smidgeOptions.UrlOptions.CompositeFilePath}") ?? false) - || (absPath.Value?.InvariantStartsWith($"/{_smidgeOptions.UrlOptions.BundleFilePath}") ?? false)) + || (absPath.Value?.InvariantStartsWith($"/{_smidgeOptions.UrlOptions.BundleFilePath}") ?? false) + || _runtimeState.EnableInstaller()) { LazyInitializer.EnsureInitialized(ref s_firstBackOfficeRequest, ref s_firstBackOfficeReqestFlag, ref s_firstBackOfficeRequestLocker, () => diff --git a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs index 6ebf77727a..8c0e36a40f 100644 --- a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs +++ b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs @@ -41,13 +41,22 @@ public sealed class FrontEndRoutes : IAreaRoutes /// public void CreateRoutes(IEndpointRouteBuilder endpoints) { - if (_runtimeState.Level != RuntimeLevel.Run) + switch (_runtimeState.Level) { - return; + case RuntimeLevel.Install: + case RuntimeLevel.Upgrade: + case RuntimeLevel.Run: + + AutoRouteSurfaceControllers(endpoints); + AutoRouteFrontEndApiControllers(endpoints); + break; + case RuntimeLevel.BootFailed: + case RuntimeLevel.Unknown: + case RuntimeLevel.Boot: + break; } - AutoRouteSurfaceControllers(endpoints); - AutoRouteFrontEndApiControllers(endpoints); + } /// diff --git a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs index c1cc360500..5617797ec7 100644 --- a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs +++ b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs @@ -117,9 +117,20 @@ public class UmbracoRouteValueTransformer : DynamicRouteValueTransformer public override async ValueTask TransformAsync( HttpContext httpContext, RouteValueDictionary values) { - // If we aren't running, then we have nothing to route - if (_runtime.Level != RuntimeLevel.Run) + // If we aren't running, then we have nothing to route. We allow the frontend to continue while in upgrade mode. + if (_runtime.Level != RuntimeLevel.Run && _runtime.Level != RuntimeLevel.Upgrade) { + if (_runtime.Level == RuntimeLevel.Install) + { + return new RouteValueDictionary() + { + //TODO figure out constants + [ControllerToken] = "Install", + [ActionToken] = "Index", + [AreaToken] = Constants.Web.Mvc.InstallArea, + }; + } + return null!; } @@ -184,6 +195,7 @@ public class UmbracoRouteValueTransformer : DynamicRouteValueTransformer // our default 404 page but we cannot return route values now because // it's possible that a developer is handling dynamic routes too. // Our 404 page will be handled with the NotFoundSelectorPolicy + return null!; } diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs index c5a8eb5201..6655475e36 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs @@ -38,7 +38,7 @@ public class InstallAreaRoutesTests var endpoints = new TestRouteBuilder(); routes.CreateRoutes(endpoints); - Assert.AreEqual(2, endpoints.DataSources.Count); + Assert.AreEqual(1, endpoints.DataSources.Count); var route = endpoints.DataSources.First(); Assert.AreEqual(2, route.Endpoints.Count); @@ -64,10 +64,11 @@ public class InstallAreaRoutesTests endpoint2.RoutePattern.Defaults[AreaToken], typeof(InstallController).GetCustomAttribute(false).RouteValue); - var fallbackRoute = endpoints.DataSources.Last(); - Assert.AreEqual(1, fallbackRoute.Endpoints.Count); + var dataSource = endpoints.DataSources.Last(); + Assert.AreEqual(2, dataSource.Endpoints.Count); - Assert.AreEqual("Fallback {*path:nonfile}", fallbackRoute.Endpoints[0].ToString()); + Assert.AreEqual("Route: install/api/{action}/{id?}", dataSource.Endpoints[0].ToString()); + Assert.AreEqual("Route: install/{action}/{id?}", dataSource.Endpoints[1].ToString()); } [Test] @@ -79,10 +80,13 @@ public class InstallAreaRoutesTests Assert.AreEqual(1, endpoints.DataSources.Count); var route = endpoints.DataSources.First(); - Assert.AreEqual(1, route.Endpoints.Count); + Assert.AreEqual(2, route.Endpoints.Count); var routeEndpoint = (RouteEndpoint)route.Endpoints[0]; - Assert.AreEqual("install/{controller?}/{action?}", routeEndpoint.RoutePattern.RawText); + Assert.AreEqual("install/api/{action}/{id?}", routeEndpoint.RoutePattern.RawText); + + routeEndpoint = (RouteEndpoint)route.Endpoints[1]; + Assert.AreEqual("install/{action}/{id?}", routeEndpoint.RoutePattern.RawText); } private InstallAreaRoutes GetInstallAreaRoutes(RuntimeLevel level) =>