yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/front-end-routing

Browse Source 
# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
This commit is contained in:
Shannon
2020-12-16 16:18:10 +11:00
parent 4bb1535786 1e09d0b063
commit ce508d08ec
251 changed files with 2093 additions and 3884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.NetCore/Startup.cs
View File

@@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Umbraco.Extensions;
using Umbraco.Core.DependencyInjection;
using Umbraco.Extensions;
namespace Umbraco.Web.UI.NetCore
{
@@ -28,11 +28,14 @@ namespace Umbraco.Web.UI.NetCore
_config = config ?? throw new ArgumentNullException(nameof(config));
}
// This method gets called by the runtime. Use this method to add services to the container.
// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
/// <summary>
/// Configures the services
/// </summary>
/// <remarks>
/// This method gets called by the runtime. Use this method to add services to the container.
/// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
/// </remarks>
public void ConfigureServices(IServiceCollection services)
{
#pragma warning disable IDE0022 // Use expression body for methods

6
src/Umbraco.Web.UI.NetCore/appsettings.json
View File

@@ -1,6 +1,6 @@
{
"ConnectionStrings": {
"umbracoDbDSN": "Server=(LocalDB)\\Umbraco;Database=NetCore;Integrated Security=true"
"umbracoDbDSN": ""
},
"Serilog": {
"MinimumLevel": {
@@ -39,7 +39,7 @@
},
"RuntimeMinification": {
"dataFolder": "App_Data/TEMP/Smidge",
"version": "637429346786793415"
"version": "637432008251409860"
},
"Security": {
"KeepUserLoggedIn": false,
@@ -71,4 +71,4 @@
}
}
}
}
}

6
src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml
View File

@@ -28,7 +28,8 @@
var OpenWebsiteTitle = LocalizedTextService.Localize("preview", "openWebsiteTitle");
var returnToPreviewHeadline = LocalizedTextService.Localize("preview", "returnToPreviewHeadline");
var returnToPreviewDescription = LocalizedTextService.Localize("preview", "returnToPreviewDescription");
var returnToPreviewButton = LocalizedTextService.Localize("preview", "returnToPreviewButton");
var returnToPreviewAcceptButton = LocalizedTextService.Localize("preview", "returnToPreviewAcceptButton");
var returnToPreviewDeclineButton = LocalizedTextService.Localize("preview", "returnToPreviewDeclineButton");
}
<!DOCTYPE html>
<html lang="en">
@@ -44,7 +45,8 @@
window.umbLocalizedVars = {
'returnToPreviewHeadline': '@returnToPreviewHeadline',
'returnToPreviewDescription':'@returnToPreviewDescription',
'returnToPreviewButton':'@returnToPreviewButton'
'returnToPreviewAcceptButton':'@returnToPreviewAcceptButton',
'returnToPreviewDeclineButton':'@returnToPreviewDeclineButton'
};
</script>
</head>

7
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
View File

@@ -1439,7 +1439,7 @@ Mange hilsner fra Umbraco robotten
<key alias="elementDoesNotSupport">Dette benyttes ikke for en Element-type</key>
<key alias="propertyHasChanges">Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?</key>
<key alias="displaySettingsHeadline">Visning</key>
<key alias="displaySettingsLabelOnTop">Flyt label over editoren</key>
<key alias="displaySettingsLabelOnTop">Label hen over (fuld brede)</key>
</area>
<area alias="languages">
<key alias="addLanguage">Tilføj sprog</key>
@@ -1873,8 +1873,9 @@ Mange hilsner fra Umbraco robotten
<key alias="openWebsiteLabel">Vis i nyt vindue</key>
<key alias="openWebsiteTitle">Åben forhåndsvisning i nyt vindue</key>
<key alias="returnToPreviewHeadline">Forhåndsvisning af indholdet?</key>
<key alias="returnToPreviewDescription">Du har afslutet forhåndsvisning, vil du se dette indhold i forhåndsvisning?</key>
<key alias="returnToPreviewButton">Fortsæt</key>
<key alias="returnToPreviewDescription">Du har afslutet forhåndsvisning, vil du starte forhåndsvisning igen for at se seneste gemte version af indholdet?</key>
<key alias="returnToPreviewButton">Start forhåndsvisning</key>
<key alias="returnToPreviewDeclineButton">Se udgivet indhold</key>
<key alias="viewPublishedContentHeadline">Se udgivet indhold?</key>
<key alias="viewPublishedContentDescription">Du er i forhåndsvisning, vil du afslutte for at se den udgivet version?</key>
<key alias="viewPublishedContentAcceptButton">Se udgivet version</key>

9
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
View File

@@ -1699,7 +1699,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
<key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
<key alias="displaySettingsHeadline">Appearance</key>
<key alias="displaySettingsLabelOnTop">Display label on top of editor.</key>
<key alias="displaySettingsLabelOnTop">Label above (full-width)</key>
</area>
<area alias="languages">
<key alias="addLanguage">Add language</key>
@@ -2536,9 +2536,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="endTitle">End preview mode</key>
<key alias="openWebsiteLabel">Preview website</key>
<key alias="openWebsiteTitle">Open website in preview mode</key>
<key alias="returnToPreviewHeadline">Preview content?</key>
<key alias="returnToPreviewDescription">You have ended preview mode, do you want to continue previewing this content?</key>
<key alias="returnToPreviewButton">Preview</key>
<key alias="returnToPreviewHeadline">Preview website?</key>
<key alias="returnToPreviewDescription">ou have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewAcceptButton">Preview latest version</key>
<key alias="returnToPreviewDeclineButton">View published version</key>
<key alias="viewPublishedContentHeadline">View published version?</key>
<key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
<key alias="viewPublishedContentAcceptButton">View published version</key>

9
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
View File

@@ -1717,7 +1717,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="elementDoesNotSupport">This is not applicable for an element type</key>
<key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
<key alias="displaySettingsHeadline">Appearance</key>
<key alias="displaySettingsLabelOnTop">Display label on top of editor.</key>
<key alias="displaySettingsLabelOnTop">Label above (full-width)</key>
</area>
<area alias="languages">
<key alias="addLanguage">Add language</key>
@@ -2556,9 +2556,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="endTitle">End preview mode</key>
<key alias="openWebsiteLabel">Preview website</key>
<key alias="openWebsiteTitle">Open website in preview mode</key>
<key alias="returnToPreviewHeadline">Preview content?</key>
<key alias="returnToPreviewDescription">You have ended preview mode, do you want to continue previewing this content?</key>
<key alias="returnToPreviewButton">Preview</key>
<key alias="returnToPreviewHeadline">Preview website?</key>
<key alias="returnToPreviewDescription">ou have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewAcceptButton">Preview latest version</key>
<key alias="returnToPreviewDeclineButton">View published version</key>
<key alias="viewPublishedContentHeadline">View published version?</key>
<key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
<key alias="viewPublishedContentAcceptButton">View published version</key>