Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

# Conflicts: # build/NuSpecs/UmbracoCms.Core.nuspec # build/NuSpecs/UmbracoCms.Web.nuspec # src/SolutionInfo.cs # src/Umbraco.Core/Cache/CacheKeys.cs # src/Umbraco.Core/Composing/TypeFinder.cs # src/Umbraco.Core/Configuration/GlobalSettings.cs # src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs # src/Umbraco.Core/Configuration/IGlobalSettings.cs # src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs # src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs # src/Umbraco.Core/Constants-AppSettings.cs # src/Umbraco.Core/Editors/UserEditorAuthorizationHelper.cs # src/Umbraco.Core/Extensions/StringExtensions.cs # src/Umbraco.Core/Extensions/UriExtensions.cs # src/Umbraco.Core/IO/IOHelper.cs # src/Umbraco.Core/IO/PhysicalFileSystem.cs # src/Umbraco.Core/Media/Exif/MathEx.cs # src/Umbraco.Core/Media/UploadAutoFillProperties.cs # src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs # src/Umbraco.Core/Models/Membership/User.cs # src/Umbraco.Core/Models/UserExtensions.cs # src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs # src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs # src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs # src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs # src/Umbraco.Core/Routing/AliasUrlProvider.cs # src/Umbraco.Core/Routing/DefaultUrlProvider.cs # src/Umbraco.Core/Routing/UriUtility.cs # src/Umbraco.Core/Routing/UrlProviderExtensions.cs # src/Umbraco.Core/Runtime/CoreRuntime.cs # src/Umbraco.Core/RuntimeOptions.cs # src/Umbraco.Core/RuntimeState.cs # src/Umbraco.Core/Security/BackOfficeUserStore.cs # src/Umbraco.Core/Security/ContentPermissions.cs # src/Umbraco.Core/Sync/ApplicationUrlHelper.cs # src/Umbraco.Core/Trees/TreeNode.cs # src/Umbraco.Core/Udi.cs # src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs # src/Umbraco.Examine/Umbraco.Examine.csproj # src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs # src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs # src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs # src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs # src/Umbraco.Infrastructure/Scoping/Scope.cs # src/Umbraco.Infrastructure/Search/ExamineComponent.cs # src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs # src/Umbraco.Infrastructure/Services/Implement/ContentService.cs # src/Umbraco.Infrastructure/Services/Implement/MediaService.cs # src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs # src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs # src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs # src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs # src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs # src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs # src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs # src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config # src/Umbraco.Tests/TestHelpers/SettingsForTests.cs # src/Umbraco.Tests/Testing/TestDatabase.cs # src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs # src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs # src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs # src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs # src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs # src/Umbraco.Web.BackOffice/Controllers/ContentController.cs # src/Umbraco.Web.BackOffice/Controllers/EntityController.cs # src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs # src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs # src/Umbraco.Web.BackOffice/Controllers/TourController.cs # src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs # src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs # src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs # src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs # src/Umbraco.Web.BackOffice/Services/IconService.cs # src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs # src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs # src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs # src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs # src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js # src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/config/umbracoSettings.Release.config # src/Umbraco.Web/Cache/MemberCacheRefresher.cs # src/Umbraco.Web/Composing/ModuleInjector.cs # src/Umbraco.Web/Editors/BackOfficeController.cs # src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs # src/Umbraco.Web/Editors/ContentTypeController.cs # src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs # src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs # src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs # src/Umbraco.Web/Editors/TinyMceController.cs # src/Umbraco.Web/Editors/UserGroupsController.cs # src/Umbraco.Web/Editors/UsersController.cs # src/Umbraco.Web/ImageCropperTemplateExtensions.cs # src/Umbraco.Web/Logging/WebProfiler.cs # src/Umbraco.Web/Logging/WebProfilerProvider.cs # src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs # src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs # src/Umbraco.Web/Mvc/JsonNetResult.cs # src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs # src/Umbraco.Web/Mvc/RenderRouteHandler.cs # src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs # src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs # src/Umbraco.Web/RoutableDocumentFilter.cs # src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs # src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs # src/Umbraco.Web/Routing/PublishedRouter.cs # src/Umbraco.Web/Runtime/WebInitialComposer.cs # src/Umbraco.Web/Scheduling/KeepAlive.cs # src/Umbraco.Web/Security/AppBuilderExtensions.cs # src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs # src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs # src/Umbraco.Web/Trees/DictionaryTreeController.cs # src/Umbraco.Web/Trees/LanguageTreeController.cs # src/Umbraco.Web/Trees/LogViewerTreeController.cs # src/Umbraco.Web/Trees/PackagesTreeController.cs # src/Umbraco.Web/UmbracoApplication.cs # src/Umbraco.Web/UmbracoApplicationBase.cs # src/Umbraco.Web/UmbracoInjectedModule.cs # src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs # src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs # src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs # src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs # src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
2021-03-05 15:36:27 +01:00
parent 0daad54d7f e75178e8a6
commit 37ed84871a
274 changed files with 3063 additions and 1341 deletions
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -1,6 +1,6 @@
 {
  "ConnectionStrings": {
-    "umbracoDbDSN": ""
+    "umbracoDbDSN": "Server=(LocalDB)\\Umbraco;Database=Netcore;Integrated Security=true"
  },
  "Serilog": {
    "MinimumLevel": {
@@ -25,7 +25,8 @@
        "HideTopLevelNodeFromPath": true,
        "UmbracoPath": "~/umbraco",
        "TimeOutInMinutes": 20,
-        "UseHttps": false
+        "UseHttps": false,
+        "Id": "ddc95ed0-565b-4a63-bcdc-841f312f3e12"
      },
      "Hosting": {
        "Debug": false
@@ -42,7 +43,7 @@
        "version": "637432008251409860"
      },
      "Security": {
-        "KeepUserLoggedIn": false,
+        "KeepUserLoggedIn": true,
        "UsernameIsEmail": true,
        "HideDisabledUsersInBackoffice": false,
        "UserPassword": {
@@ -71,4 +72,4 @@
      }
    }
  }
-}
+}
--- a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
@@ -264,6 +264,8 @@
    <key alias="titleOptional">Titel (valgfri)</key>
    <key alias="altTextOptional">Alternativ tekst (valgfri)</key>
    <key alias="type">Type</key>
+    <key alias="variantsToPublish">Hvilke varianter vil du udgive?</key>
+    <key alias="variantsToSave">Vælg hvilke varianter, der skal gemmes.</key>
    <key alias="unpublish">Afpublicér</key>
    <key alias="unpublished">Afpubliceret</key>
    <key alias="notCreated">Ikke oprettet</key>
@@ -326,7 +328,7 @@
    <key alias="copyFailed">Kopiering af mediet fejlede</key>
    <key alias="createFolderFailed">Oprettelse af mappen under parent med id %0% fejlede</key>
    <key alias="renameFolderFailed">Omdøbning af mappen med id %0% fejlede</key>
-    <key alias="dragAndDropYourFilesIntoTheArea">Træk dine filer ind i dropzonen for, at uploade dem til mediebiblioteketet.</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Træk dine filer ind i dropzonen for, at uploade dem til mediebiblioteket.</key>
  </area>
  <area alias="member">
    <key alias="createNewMember">Opret et nyt medlem</key>
@@ -348,6 +350,16 @@
    <key alias="noMediaTypesWithNoSettingsAccess">Det valgte medie i træet tillader ikke at medier oprettes under det.</key>
    <key alias="noMediaTypesEditPermissions">Rediger tilladelser for denne medietype.</key>
    <key alias="documentTypeWithoutTemplate">Dokumenttype uden skabelon</key>
+    <key alias="documentTypeWithTemplate">Dokumenttype med skabelon</key>
+    <key alias="documentTypeWithTemplateDescription">Definerer en indholdsside, der kan oprettes af redaktørerne i indholdstræet, og som er kan tilgås direkte på en URL.</key>
+    <key alias="documentType">Dokumenttype</key>
+    <key alias="documentTypeDescription">Definerer en indholdskomponent, der kan oprettes af redaktørerne i indholdstræet og benyttes i sammenhæng med andet indhold, men som ikke kan tilgås direkte på en URL.</key>
+    <key alias="elementType">Element-type</key>
+    <key alias="elementTypeDescription">Definerer skabelonen for et sæt at egenskaber, der kan anvendes som skema i avancerede felter som f.eks. 'Block List' eller 'Nested Content'.</key>
+    <key alias="composition">Komposition</key>
+    <key alias="compositionDescription">Definerer et sæt genbrugbare egenskaber, der kan inkluderes i definitionen af andre dokumenttyper - f.eks. et sæt 'Almindelige side-data'.</key>
+    <key alias="folder">Mappe</key>
+    <key alias="folderDescription">Benyttes til at organisere dokumenttyper, element-typer og kompositioner i dokumenttype-træet.</key>
    <key alias="newFolder">Ny mappe</key>
    <key alias="newDataType">Ny datatype</key>
    <key alias="newJavascriptFile">Ny JavaScript-fil</key>
@@ -527,7 +539,7 @@
    <key alias="fields">felter</key>
    <key alias="indexCannotRead">Indexet skal bygges igen, for at kunne læses</key>
    <key alias="processIsTakingLonger">Processen tager længere tid end forventet. Kontrollér Umbraco loggen for at se om der er sket fejl under operationen</key>
-    <key alias="indexCannotRebuild">Dette index kan ikke genbygess for det ikke har nogen</key>
+    <key alias="indexCannotRebuild">Dette index kan ikke genbygges for det ikke har nogen</key>
    <key alias="iIndexPopulator">IIndexPopulator</key>
  </area>
  <area alias="placeholders">
--- a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
@@ -268,6 +268,7 @@
    <key alias="statistics">Statistics</key>
    <key alias="titleOptional">Title (optional)</key>
    <key alias="altTextOptional">Alternative text (optional)</key>
+    <key alias="captionTextOptional">Caption (optional)</key>
    <key alias="type">Type</key>
    <key alias="unpublish">Unpublish</key>
    <key alias="unpublished">Unpublished</key>
@@ -370,6 +371,16 @@
    <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="documentTypeWithTemplate">Document Type with Template</key>
+    <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</key>
+    <key alias="composition">Composition</key>
+    <key alias="compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</key>
+    <key alias="folder">Folder</key>
+    <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
    <key alias="newFolder">New folder</key>
    <key alias="newDataType">New data type</key>
    <key alias="newJavascriptFile">New JavaScript file</key>
@@ -798,6 +809,7 @@
    <key alias="articles">Articles</key>
    <key alias="videos">Videos</key>
    <key alias="installing">Installing</key>
+    <key alias="avatar">Avatar for</key>
  </area>
  <area alias="colors">
    <key alias="blue">Blue</key>
--- a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
@@ -272,6 +272,7 @@
    <key alias="statistics">Statistics</key>
    <key alias="titleOptional">Title (optional)</key>
    <key alias="altTextOptional">Alternative text (optional)</key>
+    <key alias="captionTextOptional">Caption (optional)</key>
    <key alias="type">Type</key>
    <key alias="unpublish">Unpublish</key>
    <key alias="unpublished">Draft</key>
@@ -377,6 +378,16 @@
    <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="documentTypeWithTemplate">Document Type with Template</key>
+    <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</key>
+    <key alias="composition">Composition</key>
+    <key alias="compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</key>
+    <key alias="folder">Folder</key>
+    <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
    <key alias="newFolder">New folder</key>
    <key alias="newDataType">New data type</key>
    <key alias="newJavascriptFile">New JavaScript file</key>
@@ -807,6 +818,7 @@
    <key alias="articles">Articles</key>
    <key alias="videos">Videos</key>
    <key alias="installing">Installing</key>
+    <key alias="avatar">Avatar for</key>
  </area>
  <area alias="colors">
    <key alias="blue">Blue</key>
--- a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/fr.xml
@@ -263,6 +263,7 @@
    <key alias="statistics">Statistiques</key>
    <key alias="titleOptional">Titre (optionnel)</key>
    <key alias="altTextOptional">Texte alternatif (optionnel)</key>
+    <key alias="captionTextOptional">Légende (optionnel)</key>
    <key alias="type">Type</key>
    <key alias="unpublish">Dépublier</key>
    <key alias="unpublished">Dépublié</key>
@@ -762,6 +763,7 @@
    <key alias="current">actuel</key>
    <key alias="embed">Intégrer</key>
    <key alias="selected">sélectionné</key>
+    <key alias="avatar">Avatar de</key>
  </area>
  <area alias="colors">
    <key alias="blue">Bleu</key>
--- a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nl.xml
@@ -806,6 +806,7 @@
    <key alias="articles">Artikels</key>
    <key alias="videos">Videos</key>
    <key alias="installing">Installeren</key>
+    <key alias="avatar">Avatar van</key>
  </area>
  <area alias="colors">
    <key alias="blue">Blauw</key>
--- a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/sv.xml
@@ -243,10 +243,10 @@
    <key alias="formsInstall">Installera Umbraco Forms</key>
  </area>
  <area alias="prompt">
-    <key alias="stay">Stay</key>
-    <key alias="discardChanges">Discard changes</key>
-    <key alias="unsavedChanges">You have unsaved changes</key>
-    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
+    <key alias="stay">Stanna</key>
+    <key alias="discardChanges">Ignorera ändringar</key>
+    <key alias="unsavedChanges">Du har ändringar som inte är sparade</key>
+    <key alias="unsavedChangesWarning">Vill du verkligen lämna sidan? Du har ändringar som inte är sparade</key>
  </area>
  <area alias="bulk">
    <key alias="done">Klar</key>
@@ -741,8 +741,8 @@
    <key alias="tabs">Flikar</key>
  </area>
  <area alias="sort">
-    <key alias="sortOrder">Sort order</key>
-    <key alias="sortCreationDate">Creation date</key>
+    <key alias="sortOrder">Sortera ordningen</key>
+    <key alias="sortCreationDate">Skapandedatum</key>
    <key alias="sortDone">Sortering klar</key>
    <key alias="sortHelp">Välj i vilken ordning du vill ha sidorna genom att dra dem upp eller ner i listan. Du kan också klicka på kolumnrubrikerna för att sortera grupper av sidor</key>
    <key alias="sortPleaseWait"><![CDATA[Vänta medan sidorna sorteras. Det kan ta en stund.]]></key>
@@ -815,12 +815,12 @@
  </area>
  <area alias="grid">
    <key alias="media">Bild</key>
-    <key alias="macro">Macro</key>
+    <key alias="macro">Makro</key>
    <key alias="insertControl">Lägg till</key>
-    <key alias="chooseLayout">Choose layout</key>
+    <key alias="chooseLayout">Välj utformning</key>
    <key alias="addRows">Lägg till rad</key>
-    <key alias="addElement">Add content</key>
-    <key alias="dropElement">Drop content</key>
+    <key alias="addElement">Lägg till innehåll</key>
+    <key alias="dropElement">Släpp innehåll</key>
    <key alias="contentNotAllowed">Indholdet er ikke tilladt her</key>
    <key alias="contentAllowed">Indholdet er tilladt her</key>
    <key alias="clickToEmbed">Klicka för att lägga in</key>
@@ -847,7 +847,7 @@
  <area alias="templateEditor">
    <key alias="alternativeField">Alternativt fält</key>
    <key alias="alternativeText">Alternativ text</key>
-    <key alias="casing">Casing</key>
+    <key alias="casing">Hölje</key>
    <key alias="chooseField">Välj fält</key>
    <key alias="convertLineBreaks">Konvertera radbrytningar</key>
    <key alias="convertLineBreaksHelp">Byter radbrytningar mot html-taggen &amp;lt;br&amp;gt;</key>
@@ -963,7 +963,7 @@
    <key alias="lastLockoutDate">Senast utlåst</key>
    <key alias="lastLogin">Senast inloggad</key>
    <key alias="lastPasswordChangeDate">Lösenordet ändrades</key>
-    <key alias="loginname">Login</key>
+    <key alias="loginname">Logga in</key>
    <key alias="mediastartnode">Startnod i mediabiblioteket</key>
    <key alias="mediastartnodehelp">Begränsa media sectionen till en specifik startnod</key>
    <key alias="mediastartnodes">Media startnoder</key>