Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
d868263
Bump version
nikolajlauridsen Oct 19, 2022
fdbf3df
Add PrivateAssets="all" to mangement api project reference (#13249)
nikolajlauridsen Oct 20, 2022
86fb24a
Bump version
nikolajlauridsen Oct 20, 2022
8954b7f
Use the actual save function for saving the copy (#13066)
patrickdemooij9 Oct 12, 2022
0258f24
Unbreak breaking change in #13066 (#13288)
nul800sebastiaan Oct 25, 2022
de2a927
Bump version to 10.3.2
nul800sebastiaan Oct 25, 2022
e7fae14
Parse lockId as invariant (#13284)
Zeegaan Oct 25, 2022
851e5c6
Merge branch 'release/10.3.2' into v10/dev
nikolajlauridsen Oct 27, 2022
7204c03
Allow for configuration of additional languages to install and ensure…
AndyButland Oct 31, 2022
e0b76ac
Updated Smidge (#13331)
bergmania Oct 31, 2022
ed52298
Fix casing in fileSystemBasePath (#13306)
nikolajlauridsen Nov 1, 2022
2a952c7
Add guard statement (#13340)
Zeegaan Nov 2, 2022
b5842d6
Move block grid single area rendering to its own dedicated view (#13359)
kjac Nov 8, 2022
47c0bf9
Block Grid Editor Improvements (#13282)
nielslyngsoe Nov 11, 2022
fe2cab0
remove console log
nielslyngsoe Nov 14, 2022
f9e5d63
Updated references for Forms and Deploy in JSON schema project. (#13411)
AndyButland Nov 15, 2022
b411513
Enable single block mode (#13216)
skttl Nov 16, 2022
86561d2
Block Grid Editor: Removal of the forced placement feature (#13400)
nielslyngsoe Nov 16, 2022
dff3d8a
V10: AllowedUploadFiles appsetting not working (#13408)
Zeegaan Nov 17, 2022
57ef091
Feature: Media Picker drag and drop upload directly on property edito…
madsrasmussen Nov 17, 2022
4aafbbf
V10: merge v8 blobstorage file deletion fix (#13415)
Zeegaan Nov 17, 2022
4b83ca7
Bump socket.io-parser from 4.0.4 to 4.0.5 in /src/Umbraco.Web.UI.Client
dependabot[bot] Nov 10, 2022
7c16fa8
update block grid panel name (#13325)
bkclerke Nov 17, 2022
4eb3753
Bump async from 2.6.3 to 2.6.4 in /src/Umbraco.Web.UI.Client
dependabot[bot] Oct 25, 2022
24c7fdd
Bump minimist from 1.2.5 to 1.2.7 in /src/Umbraco.Web.UI.Client
dependabot[bot] Oct 25, 2022
ac0101b
Bump eventsource from 1.1.0 to 1.1.2 in /src/Umbraco.Web.UI.Client
dependabot[bot] Oct 19, 2022
31f698e
updated package-lock
iOvergaard Nov 17, 2022
c2140cc
Bump minimatch from 3.0.4 to 3.1.2 in /src/Umbraco.Web.UI.Client
dependabot[bot] Nov 17, 2022
b698e47
Block Grid Editor sorting directive (#13391)
nielslyngsoe Nov 21, 2022
b9d799b
Block Grid Editor adjust while sorting (#13442)
nielslyngsoe Nov 21, 2022
c648505
Block Grid Editor - make prevalue overlay medium sized (#13443)
nielslyngsoe Nov 21, 2022
2a22cec
block grid editor visual adjustments (#13446)
nielslyngsoe Nov 21, 2022
a304d9b
Display media trashed state on custom view for image demo block (#13448)
nielslyngsoe Nov 21, 2022
79b5484
Block Grid Editor translations and Area size keyboard navigation (#13…
nielslyngsoe Nov 21, 2022
d2c8ecf
use custom prop for calculated width (#13451)
nielslyngsoe Nov 21, 2022
bc7e926
Bump engine.io and socket.io in /src/Umbraco.Web.UI.Client
dependabot[bot] Nov 22, 2022
4ea9208
Cherry pick #13373 to v10/dev
niekvanderreest Nov 21, 2022
f13a9d4
remove the hidding of catelouge appearance as its not located under a…
nielslyngsoe Nov 22, 2022
bce29f4
Fix preview issue for new (empty) variants (#13455)
kjac Nov 23, 2022
63fa6f3
Rollback improvements (#13452)
kjac Nov 23, 2022
dbef11b
Cherry pick #13404 to v10
nikolajlauridsen Nov 23, 2022
3a01176
Delete references using custom relation types (#13389)
bjarnef Nov 23, 2022
e366da8
V11: Fix ordering by published in list of content (#13474)
nikolajlauridsen Nov 25, 2022
c88ac85
Add support for tags in block editors and nested content (#13412)
rasmusjp Nov 28, 2022
c9a9798
Ensure that all automatic relation types are updated (#13470)
nikolajlauridsen Nov 28, 2022
877f52a
Make sure contexbar fits within the available space (#13467)
nielslyngsoe Nov 29, 2022
f4c4c90
do not set layout gaps (#13496)
nielslyngsoe Nov 29, 2022
ccab65b
V10/feature/fixing flaky acceptance test (#13473)
andr317c Nov 30, 2022
3408638
Updated Forms dependency for JSON schema to the latest version. (#13505)
AndyButland Nov 30, 2022
0d76ecb
Accessibility - Fix Packages - Modal - Empty buttons (#13114)
BatJan Nov 30, 2022
4aa0378
Changing the way we create the temp file for SQLite file (#13439)
elit0451 Nov 30, 2022
e992da7
Fix concurrency issue in UmbracoMapper (#13524)
Zeegaan Dec 5, 2022
248a0c4
Allow indexing variant nodes when not all variants are published - fi…
jonnymuir Dec 6, 2022
caed5bc
V11/feature/flaky test work (#13513) (#13527)
Zeegaan Dec 6, 2022
f28b4c1
Fix for issue 13017 - BeginUmbracoForm doesn't work with custom umbra…
justin-nevitech Dec 6, 2022
962c1a1
Merge branch 'v10/dev' into v11/dev
bergmania Dec 6, 2022
e83e2de
Rollback project imports
bergmania Dec 6, 2022
2b6205a
Remove duplicated lines in translations
bergmania Dec 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ public void Create(string connectionString)
* always initializing in this way and it probably helps for non azure scenarios also (anytime persisting on a cifs mount for example).
*/

var tempFile = Path.GetTempFileName();
// Create a random file name using cryptographically strong random number generator (RNGCryptoServiceProvider)
var tempFile = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());

var tempConnectionString = new SqliteConnectionStringBuilder { DataSource = tempFile, Pooling = false };

using (var connection = new SqliteConnection(tempConnectionString.ConnectionString))
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Core/Constants-Conventions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,15 @@ public static class RelationTypes
public const string RelateParentMediaFolderOnDeleteAlias = "relateParentMediaFolderOnDelete";

/// <summary>
/// Returns the types of relations that are automatically tracked
/// Returns the types of relations that are automatically tracked.
/// </summary>
/// <remarks>
/// Developers should not manually use these relation types since they will all be cleared whenever an entity
/// (content, media or member) is saved since they are auto-populated based on property values.
/// </remarks>
public static string[] AutomaticRelationTypes { get; } = { RelatedMediaAlias, RelatedDocumentAlias };

// TODO: return a list of built in types so we can use that to prevent deletion in the uI
// TODO: return a list of built in types so we can use that to prevent deletion in the UI
}

public static class Udi
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/cs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,6 @@
</area>
<area alias="rollback">
<key alias="headline">Vyberte verzi, kterou chcete porovnat s aktuální verzí</key>
<key alias="currentVersion">Současná verze</key>
<key alias="diffHelp"><![CDATA[Tohle ukazuje rozdíly mezi současnou verzi a vybranou verzi<br /><del>Červený</del> text nebude ve vybrané verzi zobrazen, <ins>zelený znamená přidaný</ins>].]]></key>
<key alias="documentRolledBack">Dokument byl vrácen na starší verzi</key>
<key alias="htmlHelp">Tohle zobrazuje vybranou verzi jako html, jestliže chcete vidět rozdíly mezi 2 verzemi najednou, použijte rozdílové zobrazení</key>
Expand Down
2 changes: 0 additions & 2 deletions src/Umbraco.Core/EmbeddedResources/Lang/cy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1523,8 +1523,6 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
<area alias="rollback">
<key alias="headline">Dewis fersiwn i gymharu efo fersiwn bresennol</key>
<key alias="changes">Newidiadau</key>
<key alias="created">Creuwyd</key>
<key alias="currentVersion">Fersiwn bresennol</key>
<key alias="diffHelp"><![CDATA[May hyn yn dangos y gwahaniaeth rhwng y fersiwn bresennol ac y fersiwn dewiswyd<br />Ni fydd testun <del>coch</del> yn cael ei ddangos yn y fersiwn dewiswyd. , <ins>mae gwyrdd yn golygu wedi'i ychwanegu</ins>]]></key>
<key alias="documentRolledBack">Dogfen wedi'i rolio yn ôl</key>
<key alias="htmlHelp">Mae hyn yn dangos y fersiwn dewiswyd ar ffurf HTML, os hoffwch weld y gwahaniaeth rhwng 2 fersiwn ar yr un pryd, defnyddiwch y wedd gwahaniaethol</key>
Expand Down
3 changes: 1 addition & 2 deletions src/Umbraco.Core/EmbeddedResources/Lang/da.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1238,11 +1238,10 @@ Mange hilsner fra Umbraco robotten
</area>
<area alias="rollback">
<key alias="changes">Ændringer</key>
<key alias="created">Oprettet</key>
<key alias="headline">Vælg en version at sammenligne med den nuværende version</key>
<key alias="currentVersion">Nuværende version</key>
<key alias="diffHelp">
<![CDATA[Her vises forskellene mellem den nuværende version og den valgte version<br /><del>Rød</del> tekst vil ikke blive vist i den valgte version. <ins>Grøn betyder tilføjet</ins>]]></key>
<key alias="noDiff">Der er ingen forskelle mellem den nuværende version og den valgte version</key>
<key alias="documentRolledBack">Dokument tilbagerullet</key>
<key alias="htmlHelp">Her vises den valgte version som html. Hvis du ønsker at se forskellen mellem de 2 versioner
på samme tid, brug 'diff'-oversigten
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/de.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,6 @@
</area>
<area alias="rollback">
<key alias="headline">Wählen Sie eine Version, um diese mit der aktuellen zu vergleichen</key>
<key alias="currentVersion">Aktuelle Version</key>
<key alias="diffHelp">Zeigt die Unterschiede zwischen der aktuellen und der ausgewählten Version an.&lt;br /&gt;Text in &lt;del&gt;rot&lt;/del&gt; fehlen in der ausgewählten Version, &lt;ins&gt;grün&lt;/ins&gt; markierter Text wurde hinzugefügt.</key>
<key alias="documentRolledBack">Dokument wurde zurückgesetzt</key>
<key alias="htmlHelp">Zeigt die ausgewählte Version als HTML an. Wenn Sie sich die Unterschiede zwischen zwei Versionen anzeigen lassen wollen, benutzen Sie bitte die Vergleichsansicht.</key>
Expand Down
5 changes: 2 additions & 3 deletions src/Umbraco.Core/EmbeddedResources/Lang/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1450,10 +1450,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
</area>
<area alias="rollback">
<key alias="changes">Changes</key>
<key alias="created">Created</key>
<key alias="currentVersion">Current version</key>
<key alias="diffHelp">
<![CDATA[This shows the differences between the current version and the selected version<br /><del>Red text</del> will be removed in the selected version, <ins>green text</ins> will be added]]></key>
<![CDATA[This shows the differences between the current (draft) version and the selected version<br /><del>Red text</del> will be removed in the selected version, <ins>green text</ins> will be added]]></key>
<key alias="noDiff">There are no differences between the current (draft) version and the selected version</key>
<key alias="documentRolledBack">Document has been rolled back</key>
<key alias="headline">Select a version to compare with the current version</key>
<key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2
Expand Down
6 changes: 2 additions & 4 deletions src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1490,11 +1490,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
</area>
<area alias="rollback">
<key alias="changes">Changes</key>
<key alias="created">Created</key>
<key alias="headline">Select a version to compare with the current version</key>
<key alias="currentVersion">Current version</key>
<key alias="diffHelp">
<![CDATA[This shows the differences between the current version and the selected version<br /><del>Red text</del> will be removed in the selected version, <ins>green text</ins> will be added]]></key>
<![CDATA[This shows the differences between the current (draft) version and the selected version<br /><del>Red text</del> will be removed in the selected version, <ins>green text</ins> will be added]]></key>
<key alias="noDiff">There are no differences between the current (draft) version and the selected version</key>
<key alias="documentRolledBack">Document has been rolled back</key>
<key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2
versions at the same time, use the diff view
Expand All @@ -1504,7 +1503,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="view">View</key>
<key alias="pagination"><![CDATA[Showing version %0% to %1% of %2% versions]]></key>
<key alias="versions">Versions</key>
<key alias="currentDraftVersion">Current draft version</key>
<key alias="currentPublishedVersion">Current published version</key>
</area>
<area alias="scripts">
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/es.xml
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,6 @@
<key alias="reset">Reiniciar</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Versión actual</key>
<key alias="diffHelp"><![CDATA[Esto muestra las diferencias entre la versión actual y la versión seleccionada<br /><del>Red</del> el texto de la versión seleccionada no se mostrará. , <ins>el verde significa añadido</ins>]]></key>
<key alias="documentRolledBack">Se ha recuperado la última versión del documento.</key>
<key alias="htmlHelp">Esto muestra la versión seleccionada como html, si deseas ver la diferencia entre 2 versiones al mismo tiempo, por favor usa la vista diff</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/fr.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
</area>
<area alias="rollback">
<key alias="headline">Sélectionnez une version à comparer avec la version actuelle</key>
<key alias="currentVersion">Version actuelle</key>
<key alias="diffHelp"><![CDATA[Ceci affiche les différences entre la version actuelle et la version choisie<br />Le texte en <del>Rouge</del> signifie qu'il a été supprimé de la version choisie, <ins>vert signifie ajouté</ins>]]></key>
<key alias="documentRolledBack">Le document a été restauré à une version antérieure</key>
<key alias="htmlHelp">Ceci affiche la version choisie en tant que HTML, si vous souhaitez voir les différences entre les deux versions en même temps, utilisez la vue différentielle</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/he.xml
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="removeLink">הסר קישור</key>
</area>
<area alias="rollback">
<key alias="currentVersion">גירסה עדכנית</key>
<key alias="diffHelp"><![CDATA[להלן ההבדלים בין הגירסא הנוכחית לבין הגרסא שנבחרה. <br />טקסט <del>אדום</del> לא יוצג בגרסא שנבחרה, טקסט <ins>ירוק</ins> מייצט טקסט שנוסף.]]></key>
<key alias="documentRolledBack">המסמך שוחזר בהצלחה</key>
<key alias="htmlHelp">להלן הגרסא שנבחרה כHTML, אם הינך לצפות בשינויים בין שתי הגרסאות בו זמנית, בחר ב diff</key>
Expand Down
2 changes: 0 additions & 2 deletions src/Umbraco.Core/EmbeddedResources/Lang/it.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1530,9 +1530,7 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in
</area>
<area alias="rollback">
<key alias="changes">Modifiche</key>
<key alias="created">Creato</key>
<key alias="headline">Seleziona una versione da confrontare con la versione corrente</key>
<key alias="currentVersion"><![CDATA[Versione corrente]]></key>
<key alias="diffHelp">
<![CDATA[Qui vengono mostrate le differenze tra la versione corrente e la versione selezionata<br />Il testo <del>in rosso</del> non verrà mostrato nella versione selezionata, <ins>quello in verde verrà aggiunto</ins>]]></key>
<key alias="documentRolledBack"><![CDATA[Il documento è stato riportato alla versione scelta.]]></key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/ja.xml
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,6 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="reset">リセット</key>
</area>
<area alias="rollback">
<key alias="currentVersion">現在の版</key>
<key alias="diffHelp"><![CDATA[現在の版と選択した以前の版との比較を表示します。<br /><del>赤</del> の文字列は以前の版にはない部分で、<ins>緑の文字列は以前の版にのみある部分です。</ins>]]></key>
<key alias="documentRolledBack">ドキュメントは以前の版に戻りました</key>
<key alias="htmlHelp">選択した版をhtmlで表示します。2つの版の比較を表示したいときは、Diff を選択してください。</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/ko.xml
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@
<key alias="removeLink">링크 삭제</key>
</area>
<area alias="rollback">
<key alias="currentVersion">현재 버전</key>
<key alias="diffHelp"><![CDATA[현재 버전과 선택한 버전의 차이점을 보여줍니다<br /><del>빨간</del> 텍스트는 선택한 버전에선 보이지 않습니다. <ins>녹색은 추가되었음을 의미합니다</ins>]]></key>
<key alias="documentRolledBack">문서가 롤백되었습니다.</key>
<key alias="htmlHelp">선택한 버전을 html로 보여줍니다. 두 버전의 차이점을 동시에 보시려면, 차이점 보기를 사용하세요</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/nb.xml
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,6 @@ Vennlig hilsen Umbraco roboten
<key alias="reset">Nullstill</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Gjeldende versjon</key>
<key alias="diffHelp"><![CDATA[Dette viser forskjellene mellom den gjeldende og den valgte versjonen<br /><del>Rød</del> tekst vil ikke bli vist i den valgte versjonen. , <ins>grønn betyr lagt til</ins>]]></key>
<key alias="documentRolledBack">Dokumentet er tilbakeført til en tidligere versjon</key>
<key alias="htmlHelp">Dette viser den valgte versjonen som HTML, bruk avviksvisningen hvis du ønsker å se forksjellene mellom to versjoner samtidig.</key>
Expand Down
3 changes: 0 additions & 3 deletions src/Umbraco.Core/EmbeddedResources/Lang/nl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1253,9 +1253,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
</area>
<area alias="rollback">
<key alias="changes">Wijzigingen</key>
<key alias="created">Aangemaakt</key>
<key alias="headline">Selecteer een versie om te vergelijken met de huidige versie</key>
<key alias="currentVersion">Huidige versie</key>
<key alias="diffHelp">
<![CDATA[Hier worden de verschillen getoond tussen de huidige en de geselecteerde versie<br /><del>Rode</del> tekst wordt niet getoond in de geselecteerde versie, <ins>groen betekent toegevoegd</ins>]]></key>
<key alias="documentRolledBack">Document is teruggezet</key>
Expand All @@ -1267,7 +1265,6 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
<key alias="view">Bekijk</key>
<key alias="pagination"><![CDATA[Toont versie %0% tot %1% van %2% versies]]></key>
<key alias="versions">Versies</key>
<key alias="currentDraftVersion">Conceptversie</key>
<key alias="currentPublishedVersion">Gepubliceerde versie</key>
</area>
<area alias="scripts">
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/pl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,6 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
<key alias="reset">Resetuj</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Aktualna wersja</key>
<key alias="diffHelp"><![CDATA[Tu pokazane są różnice pomiędzy bieżącą oraz wybraną wersją <br/><del>Czerwony</del> tekst nie będzie pokazany w wybranej wersji, <ins>zielony tekst został dodany</ins>]]></key>
<key alias="documentRolledBack">Dokument został przywrócony</key>
<key alias="htmlHelp">Tu widać wybraną wersję jako html, jeżeli chcesz zobaczyć różnicę pomiędzy 2 wersjami w tym samym czasie, użyj podglądu różnic</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/pt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,6 @@ Você pode publicar esta página e todas suas sub-páginas ao selecionar <em>pub
<key alias="removeLink">Remover Link</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Versão atual</key>
<key alias="diffHelp"><![CDATA[Isto mostra as diferenças entre a versão atual e a versão selecionada <br />Texto <del>vermelho</del> não será mostrado na versão selecionada; <ins>verde significa adicionado</ins>]]></key>
<key alias="documentRolledBack">Documento foi revertido</key>
<key alias="htmlHelp">Isto mostra a versão selecionada como html se você deseja ver as diferenças entre as 2 versões ao mesmo tempo use a visão em diff</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/ru.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,6 @@
<key alias="folderWasRenamed">'%0%' была переименована в '%1%'</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Текущая версия</key>
<key alias="diffHelp"><![CDATA[Здесь показаны различия между новейшей версией документа и выбранной Вами версией.<br /><del>Красным</del> отмечен текст, которого уже нет в последней версии, <ins>зеленым</ins> - текст, который добавлен]]></key>
<key alias="documentRolledBack">Произведен откат к ранней версии</key>
<key alias="htmlHelp">Текущая версия показана в виде HTML. Для просмотра различий в версиях выберите режим сравнения</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/sv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,6 @@
<key alias="reset">Återställ</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Nuvarande version</key>
<key alias="diffHelp"><![CDATA[Här visas skillnaderna mellan nuvarande version och vald version<br /><del>Röd</del> text kommer inte att synas i den valda versionen. , <ins>Grön betyder att den har tillkommit</ins>]]></key>
<key alias="documentRolledBack">Dokumentet har återgått till en tidigare version</key>
<key alias="htmlHelp">Här visas den valda sidversionen i HTML. Om du vill se skillnaden mellan två versioner samtidigt, välj istället "Diff".</key>
Expand Down
2 changes: 0 additions & 2 deletions src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1319,8 +1319,6 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
</area>
<area alias="rollback">
<key alias="changes">Değişiklikler</key>
<key alias="created">Oluşturuldu</key>
<key alias="currentVersion">Mevcut sürüm</key>
<key alias="diffHelp"><![CDATA[Bu, mevcut sürüm ile seçili sürüm arasındaki farkları gösterir <br /> <del> Kırmızı </del> metin seçili sürümde gösterilmeyecektir. , <ins> yeşil eklendi demektir </ins>]]></key>
<key alias="documentRolledBack">Belge geri alındı ​​</key>
<key alias="headline">Mevcut sürümle karşılaştırmak için bir sürüm seçin</key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/zh.xml
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,6 @@
<key alias="reset">Reset</key>
</area>
<area alias="rollback">
<key alias="currentVersion">当前版本</key>
<key alias="diffHelp"><![CDATA[显示当前版本和选择版本的差异<br /><del>红色</del>是选中版本中没有的。<ins>绿色是新增的</ins>]]></key>
<key alias="documentRolledBack">文档已回滚</key>
<key alias="htmlHelp"><![CDATA[将选中版本显示为HTML,如果您想看到版本间的差异比较,请使用对比视图。]]></key>
Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,6 @@
<key alias="reset">重設</key>
</area>
<area alias="rollback">
<key alias="currentVersion">當前版本</key>
<key alias="diffHelp"><![CDATA[這顯示目前版本以及所選版本的差異。<br /><del>紅色</del> 文字將不會顯示於所選版本,而<ins>綠色</ins>表示增加部分。]]></key>
<key alias="documentRolledBack">文檔已回滾</key>
<key alias="htmlHelp">這顯示所選版本的HTML格式,如果您想要比較兩版本的差異,請使用比較檢視</key>
Expand Down
8 changes: 2 additions & 6 deletions src/Umbraco.Core/Models/PropertyTagsExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,15 @@ public static class PropertyTagsExtensions

IDataEditor? editor = propertyEditors[property.PropertyType?.PropertyEditorAlias];
TagsPropertyEditorAttribute? tagAttribute = editor?.GetTagAttribute();
if (tagAttribute == null)
{
return null;
}

var configurationObject = property.PropertyType is null
? null
: dataTypeService.GetDataType(property.PropertyType.DataTypeId)?.Configuration;
TagConfiguration? configuration = ConfigurationEditor.ConfigurationAs<TagConfiguration>(configurationObject);
TagConfiguration? configuration = configurationObject as TagConfiguration;

if (configuration is not null && configuration.Delimiter == default)
{
configuration.Delimiter = tagAttribute.Delimiter;
configuration.Delimiter = tagAttribute?.Delimiter ?? ',';
}

return configuration;
Expand Down
7 changes: 7 additions & 0 deletions src/Umbraco.Core/PropertyEditors/BlockListConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ public class BlockListConfiguration
[ConfigurationField("validationLimit", "Amount", "numberrange", Description = "Set a required range of blocks")]
public NumberRange ValidationLimit { get; set; } = new();

[ConfigurationField("useSingleBlockMode", "Single block mode", "boolean",
Description = @"When in Single block mode, the output will be BlockListItem<>, instead of BlockListModel.

**NOTE:**
Single block mode requires a maximum of one available block, and an amount set to minimum 1 and maximum 1 blocks.")]
public bool UseSingleBlockMode { get; set; }

[ConfigurationField("useLiveEditing", "Live editing mode", "boolean", Description = "Live editing in editor overlays for live updated custom views or labels using custom expression.")]
public bool UseLiveEditing { get; set; }

Expand Down
Loading