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

Merge branch 'v13/dev' into v14/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
#	src/Umbraco.Core/Services/DataTypeService.cs
This commit is contained in:
Sven Geusens
2024-02-16 11:19:15 +01:00
parent 3c9976d734 12355219d4
commit 95c0c0adad
132 changed files with 2957 additions and 2686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs
View File

@@ -122,9 +122,11 @@ public static class ViewDataExtensions
this ViewDataDictionary viewData,
BackOfficeExternalLoginProviderErrors errors) => viewData[TokenExternalSignInError] = errors;
[Obsolete("This is deprecated and will be removed in V15")]
public static string? GetPasswordResetCode(this ViewDataDictionary viewData) =>
(string?)viewData[TokenPasswordResetCode];
[Obsolete("This is deprecated and will be removed in V15")]
public static void SetPasswordResetCode(this ViewDataDictionary viewData, string value) =>
viewData[TokenPasswordResetCode] = value;