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

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

Browse Source 
# Conflicts:
#	src/Umbraco.Configuration/Legacy/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Models/ContentBaseExtensions.cs
#	src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
#	src/Umbraco.Infrastructure/RuntimeState.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
#	src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	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/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Install/Controllers/InstallController.cs
#	src/Umbraco.Web/PublishedElementExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
#	src/Umbraco.Web/UrlHelperExtensions.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
#	src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
This commit is contained in:
Bjarke Berg
2020-12-01 11:34:13 +01:00
parent 3e0d52b330 739194d71f
commit 85c01d9905
339 changed files with 24652 additions and 2269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
View File

@@ -10,7 +10,7 @@ using Microsoft.Extensions.Options;
namespace Umbraco.Core.Strings
{
/// <summary>
/// New default implementation of string functions for short strings such as aliases or url segments.
/// New default implementation of string functions for short strings such as aliases or URL segments.
/// </summary>
/// <remarks>
/// <para>Not optimized to work on large bodies of text.</para>
@@ -94,10 +94,10 @@ namespace Umbraco.Core.Strings
}
/// <summary>
/// Cleans a string to produce a string that can safely be used in an url segment.
/// Cleans a string to produce a string that can safely be used in an URL segment.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <returns>The safe url segment.</returns>
/// <returns>The safe URL segment.</returns>
/// <remarks>
/// <para>The string will be cleaned in the context of the default culture.</para>
/// <para>Url segments are Ascii only (no accents...).</para>
@@ -108,11 +108,11 @@ namespace Umbraco.Core.Strings
}
/// <summary>
/// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an url segment.
/// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an URL segment.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <param name="culture">The culture.</param>
/// <returns>The safe url segment.</returns>
/// <returns>The safe URL segment.</returns>
/// <remarks>
/// <para>Url segments are Ascii only (no accents...).</para>
/// </remarks>
@@ -123,7 +123,7 @@ namespace Umbraco.Core.Strings
/// <summary>
/// Cleans a string, in the context of the default culture, to produce a string that can safely be used as a filename,
/// both internally (on disk) and externally (as a url).
/// both internally (on disk) and externally (as a URL).
/// </summary>
/// <param name="text">The text to filter.</param>
/// <returns>The safe filename.</returns>
@@ -135,7 +135,7 @@ namespace Umbraco.Core.Strings
/// <summary>
/// Cleans a string to produce a string that can safely be used as a filename,
/// both internally (on disk) and externally (as a url).
/// both internally (on disk) and externally (as a URL).
/// </summary>
/// <param name="text">The text to filter.</param>
/// <param name="culture">The culture.</param>