Merge branch 'develop' into main

AaronSadlerUK · Sep 28, 2021 · 9030ad2 · 9030ad2
2 parents 366c9cf + 6d03462
commit 9030ad2
Show file tree

Hide file tree

Showing 202 changed files with 4,611 additions and 2,824 deletions.
diff --git a/TestSite.V9/TestSite.V9.csproj b/TestSite.V9/TestSite.V9.csproj
@@ -4,10 +4,10 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Umbraco.Cms" Version="9.0.0-rc002" />
- <PackageReference Include="Umbraco.Cms.SqlCe" Version="9.0.0-rc002" />
+ <PackageReference Include="Umbraco.Cms" Version="9.0.0" />
+ <PackageReference Include="Umbraco.Cms.SqlCe" Version="9.0.0" />
  <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
- <PackageReference Include="Umbraco.TheStarterKit" Version="9.0.0-rc001" />
+ <PackageReference Include="Umbraco.TheStarterKit" Version="9.0.0" />
  <PackageReference Include="uSync" Version="9.0.0-rc002" />
  </ItemGroup>
 

diff --git a/TestSite.V9/umbraco/UmbracoBackOffice/Default.cshtml b/TestSite.V9/umbraco/UmbracoBackOffice/Default.cshtml
@@ -1,9 +1,11 @@
 @using Microsoft.Extensions.Options;
 @using System.Globalization
+@using Umbraco.Cms.Core
 @using Umbraco.Cms.Core.Configuration
 @using Umbraco.Cms.Core.Configuration.Models
 @using Umbraco.Cms.Core.Hosting
 @using Umbraco.Cms.Core.Logging
+@using Umbraco.Cms.Core.Routing
 @using Umbraco.Cms.Core.Services
 @using Umbraco.Cms.Core.WebAssets
 @using Umbraco.Cms.Infrastructure.WebAssets
@@ -119,7 +121,7 @@
  }
  </script>
 
- <script src="lib/lazyload-js/LazyLoad.min.js"></script>
+ <script src="@WebPath.Combine(backOfficePath.TrimStart("~"), "/lib/lazyload-js/LazyLoad.min.js")"></script>
  <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice", null, hostingEnvironment, umbracoVersion, runtimeMinifier)"></script>
 
  @if (isDebug)

diff --git a/TestSite.V9/umbraco/UmbracoWebsite/NoNodes.cshtml b/TestSite.V9/umbraco/UmbracoWebsite/NoNodes.cshtml
@@ -1,4 +1,14 @@
-@model Umbraco.Cms.Web.Website.Models.NoNodesViewModel
+@using Microsoft.Extensions.Options
+@using Umbraco.Cms.Core.Configuration.Models
+@using Umbraco.Cms.Core.Hosting
+@using Umbraco.Cms.Core.Routing
+@using Umbraco.Extensions
+@model Umbraco.Cms.Web.Website.Models.NoNodesViewModel
+@inject IHostingEnvironment hostingEnvironment
+@inject IOptions<GlobalSettings> globalSettings
+@{
+ var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
+}
 <!doctype html>
 <html class="no-js" lang="en">
 <head>
@@ -8,7 +18,7 @@
 
  <title>Umbraco: No Published Content</title>
 
- <link rel="stylesheet" href="../../umbraco/assets/css/nonodes.style.min.css" />
+ <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~"), "/assets/css/nonodes.style.min.css")" />
 </head>
 <body>
 

diff --git a/TestSite.V9/umbraco/config/appsettings-schema.json b/TestSite.V9/umbraco/config/appsettings-schema.json
@@ -2454,7 +2454,7 @@
  "CacheFolder": {
  "type": "string",
  "description": "Gets or sets a value for the cache folder.",
- "default": "../umbraco/mediacache"
+ "default": "~/umbraco/Data/TEMP/MediaCache"
  }
  }
  },
@@ -2658,7 +2658,7 @@
  "integer",
  "null"
  ],
- "description": "Gets or sets a value for the maximum request length.",
+ "description": "Gets or sets a value for the maximum request length in kb.",
  "format": "int32"
  }
  }
@@ -3052,6 +3052,9 @@
  "MaxNumberOfColumnsInFormGroup": {
  "type": "integer",
  "format": "int32"
+ },
+ "DefaultTheme": {
+ "type": "string"
  }
  }
  },
@@ -3087,6 +3090,9 @@
  },
  "StoreRecordsLocally": {
  "type": "boolean"
+ },
+ "AutocompleteAttribute": {
+ "type": "string"
  }
  }
  },

diff --git a/TestSite.V9/umbraco/config/lang/cs.xml b/TestSite.V9/umbraco/config/lang/cs.xml
diff --git a/TestSite.V9/umbraco/config/lang/cy.xml b/TestSite.V9/umbraco/config/lang/cy.xml
diff --git a/TestSite.V9/umbraco/config/lang/da.xml b/TestSite.V9/umbraco/config/lang/da.xml
diff --git a/TestSite.V9/umbraco/config/lang/de.xml b/TestSite.V9/umbraco/config/lang/de.xml
diff --git a/TestSite.V9/umbraco/config/lang/en.xml b/TestSite.V9/umbraco/config/lang/en.xml
diff --git a/TestSite.V9/umbraco/config/lang/en_us.xml b/TestSite.V9/umbraco/config/lang/en_us.xml
diff --git a/TestSite.V9/umbraco/config/lang/es.xml b/TestSite.V9/umbraco/config/lang/es.xml
diff --git a/TestSite.V9/umbraco/config/lang/fr.xml b/TestSite.V9/umbraco/config/lang/fr.xml
diff --git a/TestSite.V9/umbraco/config/lang/he.xml b/TestSite.V9/umbraco/config/lang/he.xml
@@ -13,9 +13,9 @@
  <key alias="createPackage">צור חבילה</key>
  <key alias="delete">מחק</key>
  <key alias="disable">נטרל</key>
- <key alias="emptyRecycleBin">רוקן סל מיחזור</key>
+ <key alias="emptyrecyclebin">רוקן סל מיחזור</key>
  <key alias="exportDocumentType">ייצא סוג קובץ</key>
- <key alias="importDocumentType">ייבא סוג מסמך</key>
+ <key alias="importdocumenttype">ייבא סוג מסמך</key>
  <key alias="importPackage">ייבא חבילה</key>
  <key alias="liveEdit">ערוך במצב "קנבס"</key>
  <key alias="logout">יציאה</key>
@@ -30,10 +30,8 @@
  <key alias="sendtopublish">שלח לפירסום</key>
  <key alias="sendToTranslate">שלח לתירגום</key>
  <key alias="sort">מיין</key>
- <key alias="toPublish">שלח לפירסום</key>
  <key alias="translate">תרגם</key>
  <key alias="update">עדכן</key>
- <key alias="LastRunInfoAction">יומן משימות מתוזמנות</key>
  </area>
  <area alias="assignDomain">
  <key alias="addNew">הוסף דומיין חדש</key>
@@ -200,8 +198,6 @@
  ]]></key>
  <key alias="displayName">שם התצוגה לשפה</key>
  </area>
- <area alias="editcontenttype">
- </area>
  <area alias="editdatatype">
  <key alias="addPrevalue">הוסף ערך מקדים</key>
  <key alias="dataBaseDatatype">סוג מידע עבור בסיס נתונים</key>
@@ -716,7 +712,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
  <key alias="contentAllowed">This content is allowed here</key>
  <key alias="clickToEmbed">Click to embed</key>
  <key alias="clickToInsertImage">Click to insert image</key>
- <key alias="placeholderImageCaption">Image caption...</key>
  <key alias="placeholderWriteHere">Write here...</key>
  <key alias="gridLayouts">Grid Layouts</key>
  <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
@@ -864,4 +859,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
  <key alias="userTypes">סוגי משתמש</key>
  <key alias="writer">כותב</key>
  </area>
+ <area alias="logViewer">
+ <key alias="selectAllLogLevelFilters">בחר הכל</key>
+ <key alias="deselectAllLogLevelFilters">הסר סימון מהכל</key>
+ </area>
 </language>
diff --git a/TestSite.V9/umbraco/config/lang/it.xml b/TestSite.V9/umbraco/config/lang/it.xml
@@ -13,9 +13,9 @@
  <key alias="createPackage">Crea pacchetto</key>
  <key alias="delete">Cancella</key>
  <key alias="disable">Disabilita</key>
- <key alias="emptyRecycleBin">Svuota il cestino</key>
+ <key alias="emptyrecyclebin">Svuota il cestino</key>
  <key alias="exportDocumentType">Esporta il tipo di documento</key>
- <key alias="importDocumentType">Importa il tipo di documento</key>
+ <key alias="importdocumenttype">Importa il tipo di documento</key>
  <key alias="importPackage">Importa il pacchetto</key>
  <key alias="liveEdit">Modifica in Area di Lavoro</key>
  <key alias="logout">Uscita</key>
@@ -30,7 +30,6 @@
  <key alias="sendtopublish">Invia per la pubblicazione</key>
  <key alias="sendToTranslate">Invia per la traduzione</key>
  <key alias="sort">Ordina</key>
- <key alias="toPublish">Invia la pubblicazione</key>
  <key alias="translate">Traduci</key>
  <key alias="unpublish">Annulla pubblicazione</key>
  <key alias="update">Aggiorna</key>
@@ -221,8 +220,6 @@
  <key alias="description"><![CDATA[Modifica le traduzioni per l'elemento '%0%'. Puoi aggiungere una lingua sotto "Lingue" nel menù a sinistra]]></key>
  <key alias="displayName"><![CDATA[Identificativo Cultura]]></key>
  </area>
- <area alias="editcontenttype">
- </area>
  <area alias="editdatatype">
  <key alias="addPrevalue"><![CDATA[Aggiungi valore predefinito]]></key>
  <key alias="dataBaseDatatype"><![CDATA[Tipo di Dato del database]]></key>
@@ -537,31 +534,31 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in
  <key alias="mailBodyHtml">
  <![CDATA[<p>Salve %0%</p>
 
-  <p>Questa è un'email automatica per informare che l'azione <strong>'%1%'</strong>
-  è stata eseguita sulla pagina <a href="http://%4%/actions/preview.aspx?id=%5%"><strong>'%2%'</strong></a>
-  dall'utente <strong>'%3%'</strong>
-  </p>
-  <div style="margin: 8px 0; padding: 8px; display: block;">
- <br />
- <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;MODIFICA&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
- <br />
-  </div>
-  <p>
-  <h3>Riepilogo aggiornamento:</h3>
-  <table style="width: 100%;">
-  %6%
- </table>
-  </p>
+  <p>Questa è un'email automatica per informare che l'azione <strong>'%1%'</strong>
+  è stata eseguita sulla pagina <a href="http://%4%/actions/preview.aspx?id=%5%"><strong>'%2%'</strong></a>
+  dall'utente <strong>'%3%'</strong>
+  </p>
+  <div style="margin: 8px 0; padding: 8px; display: block;">
+ <br />
+ <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;MODIFICA&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
+ <br />
+  </div>
+  <p>
+  <h3>Riepilogo aggiornamento:</h3>
+  <table style="width: 100%;">
+  %6%
+ </table>
+  </p>
 
-  <div style="margin: 8px 0; padding: 8px; display: block;">
- <br />
- <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
- <br />
-  </div>
+  <div style="margin: 8px 0; padding: 8px; display: block;">
+ <br />
+ <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
+ <br />
+  </div>
 
-  <p>Buona giornata!<br /><br />
-  Grazie da Umbraco
-  </p>]]>
+  <p>Buona giornata!<br /><br />
+  Grazie da Umbraco
+  </p>]]>
  </key>
  <key alias="mailSubject">[%0%] Notifica per %1% eseguita su %2%</key>
  <key alias="notifications">Notifiche</key>
@@ -766,7 +763,6 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in
  <key alias="contentAllowed">Questo contenuto è consentito qui</key>
  <key alias="clickToEmbed">Clicca per incorporare</key>
  <key alias="clickToInsertImage">Clicca per inserire l'immagine</key>
- <key alias="placeholderImageCaption">Didascalia dell'immagine...</key>
  <key alias="placeholderWriteHere">Scrivi qui...</key>
  <key alias="gridLayouts">I Grid Layout</key>
  <key alias="gridLayoutsDetail">I layout sono l'area globale di lavoro per il grid editor, di solito ti serve solo uno o due layout differenti</key>
@@ -949,6 +945,9 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in
  <area alias="apps">
  <key alias="umbContent">Contenuti</key>
  <key alias="umbInfo">Info</key>
- <key alias="umbListView">Elementi</key>
+ </area>
+ <area alias="logViewer">
+ <key alias="selectAllLogLevelFilters">Seleziona tutto</key>
+ <key alias="deselectAllLogLevelFilters">Deselezionare tutto</key>
  </area>
 </language>
diff --git a/TestSite.V9/umbraco/config/lang/ja.xml b/TestSite.V9/umbraco/config/lang/ja.xml
@@ -14,9 +14,9 @@
  <key alias="createPackage">パッケージの作成</key>
  <key alias="delete">削除</key>
  <key alias="disable">無効</key>
- <key alias="emptyRecycleBin">ごみ箱を空にする</key>
+ <key alias="emptyrecyclebin">ごみ箱を空にする</key>
  <key alias="exportDocumentType">ドキュメントタイプの書出</key>
- <key alias="importDocumentType">ドキュメントタイプの読込</key>
+ <key alias="importdocumenttype">ドキュメントタイプの読込</key>
  <key alias="importPackage">パッケージの読み込み</key>
  <key alias="liveEdit">ライブ編集</key>
  <key alias="logout">ログアウト</key>
@@ -33,7 +33,6 @@
  <key alias="sendtopublish">公開に送る</key>
  <key alias="sendToTranslate">翻訳に送る</key>
  <key alias="sort">並べ替え</key>
- <key alias="toPublish">公開する</key>
  <key alias="translate">翻訳</key>
  <key alias="update">更新</key>
  <key alias="defaultValue">初期値</key>
@@ -877,7 +876,6 @@ Runwayをインストールして作られた新しいウェブサイトがど
  <key alias="contentAllowed">このコンテンツはここに使用できます</key>
  <key alias="clickToEmbed">クリックして埋め込む</key>
  <key alias="clickToInsertImage">クリックして画像を挿入する</key>
- <key alias="placeholderImageCaption">キャプション...</key>
  <key alias="placeholderWriteHere">ここに記入する...</key>
  <key alias="gridLayouts">レイアウト</key>
  <key alias="gridLayoutsDetail">レイアウトは通常1つまたは2つの異なるレイアウトを必要とする、グリッドエディタの全体的な作業エリアです</key>
@@ -1085,4 +1083,8 @@ Runwayをインストールして作られた新しいウェブサイトがど
  <key alias="enterCustomValidation">... またはカスタム検証を入力</key>
  <key alias="fieldIsMandatory">必須フィールドです</key>
  </area>
+ <area alias="logViewer">
+ <key alias="selectAllLogLevelFilters">すべて選択</key>
+ <key alias="deselectAllLogLevelFilters">すべての選択を解除</key>
+ </area>
 </language>
diff --git a/TestSite.V9/umbraco/config/lang/ko.xml b/TestSite.V9/umbraco/config/lang/ko.xml
@@ -13,9 +13,9 @@
  <key alias="createPackage">패키지 새로 만들기</key>
  <key alias="delete">삭제</key>
  <key alias="disable">비활성</key>
- <key alias="emptyRecycleBin">휴지통 비우기</key>
+ <key alias="emptyrecyclebin">휴지통 비우기</key>
  <key alias="exportDocumentType">추출 문서 유형</key>
- <key alias="importDocumentType">등록 문서 유형</key>
+ <key alias="importdocumenttype">등록 문서 유형</key>
  <key alias="importPackage">패키지 등록</key>
  <key alias="liveEdit">캔버스 내용 편집</key>
  <key alias="logout">종료</key>
@@ -30,7 +30,6 @@
  <key alias="sendtopublish">발행 항목으로 전달</key>
  <key alias="sendToTranslate">번역 항목으로 전달</key>
  <key alias="sort">정렬</key>
- <key alias="toPublish">발행 항목으로 전달</key>
  <key alias="translate">번역</key>
  <key alias="update">업데이트</key>
  </area>
@@ -199,8 +198,6 @@
  ]]></key>
  <key alias="displayName">국가명</key>
  </area>
- <area alias="editcontenttype">
- </area>
  <area alias="editdatatype">
  <key alias="addPrevalue">이전값 더하기</key>
  <key alias="dataBaseDatatype">데이터베이스 데이터타입</key>
@@ -699,7 +696,6 @@
  <key alias="contentAllowed">This content is allowed here</key>
  <key alias="clickToEmbed">Click to embed</key>
  <key alias="clickToInsertImage">Click to insert image</key>
- <key alias="placeholderImageCaption">Image caption...</key>
  <key alias="placeholderWriteHere">Write here...</key>
  <key alias="gridLayouts">Grid Layouts</key>
  <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
@@ -845,4 +841,8 @@
  <key alias="userTypes">사용자 타입</key>
  <key alias="writer">작성자</key>
  </area>
+ <area alias="logViewer">
+ <key alias="selectAllLogLevelFilters">모두 선택</key>
+ <key alias="deselectAllLogLevelFilters">모두 선택 해제</key>
+ </area>
 </language>
diff --git a/TestSite.V9/umbraco/config/lang/nb.xml b/TestSite.V9/umbraco/config/lang/nb.xml
@@ -14,9 +14,9 @@
  <key alias="createPackage">Opprett pakke</key>
  <key alias="delete">Slett</key>
  <key alias="disable">Deaktiver</key>
- <key alias="emptyRecycleBin">Tøm papirkurv</key>
+ <key alias="emptyrecyclebin">Tøm papirkurv</key>
  <key alias="exportDocumentType">Eksporter dokumenttype</key>
- <key alias="importDocumentType">Importer dokumenttype</key>
+ <key alias="importdocumenttype">Importer dokumenttype</key>
  <key alias="importPackage">Importer pakke</key>
  <key alias="liveEdit">Rediger i Canvas</key>
  <key alias="logout">Logg av</key>
@@ -50,7 +50,7 @@
  <key alias="domainExists">Domenet '%0%' er allerede tilknyttet</key>
  <key alias="domainUpdated">Domenet '%0%' er nå oppdatert</key>
  <key alias="orEdit">eller rediger eksisterende domener</key>
- <key alias="inherit">Arv</key>
+  <key alias="inherit">Arv</key>
  <key alias="setLanguage">Språk</key>
  <key alias="setLanguageHelp"><![CDATA[Sett språk for underordnede noder eller arv språk fra overordnet.<br/>Vil også gjelde denne noden, med mindre et underordnet domene også gjelder.]]></key>
  <key alias="setDomains">Domener</key>
@@ -81,7 +81,6 @@
  <key alias="returnToList">Tilbake til listen</key>
  <key alias="save">Lagre</key>
  <key alias="saveAndPublish">Lagre og publiser</key>
- <key alias="saveAndSchedule">Lagre og planlegge</key>
  <key alias="saveToPublish">Lagre og send til publisering</key>
  <key alias="saveAndPreview">Forhåndsvis</key>
  <key alias="showPageDisabled">Forhåndsvisning er deaktivert siden det ikke er angitt noen mal</key>
@@ -760,7 +759,6 @@ Vennlig hilsen Umbraco roboten
  <key alias="contentAllowed">Innholdstypen er tillatt her</key>
  <key alias="clickToEmbed">Klikk for å bygge inn</key>
  <key alias="clickToInsertImage">Klikk for å sette inn et bilde</key>
- <key alias="placeholderImageCaption">Bildetekst...</key>
  <key alias="placeholderWriteHere">Skriv her...</key>
  <key alias="gridLayouts">Rutenettoppsett</key>
  <key alias="gridLayoutsDetail">Et oppsett er det overordnede arbeidsområdet til ditt rutenett - du vil typisk kun behøve ett eller to</key>
@@ -918,4 +916,8 @@ Vennlig hilsen Umbraco roboten
  <key alias="yourHistory" version="7.0">Din historikk</key>
  <key alias="sessionExpires" version="7.0">Sesjonen utløper om</key>
  </area>
+ <area alias="logViewer">
+ <key alias="selectAllLogLevelFilters">Velg alle</key>
+ <key alias="deselectAllLogLevelFilters">Opphev alle</key>
+ </area>
 </language>