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

Merge remote-tracking branch 'origin/v15/dev' into v16/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Services/ITwoFactorLoginService.cs
#	src/Umbraco.Web.UI.Client/src/packages/media/dropzone/components/input-dropzone/input-dropzone.element.ts
#	src/Umbraco.Web.UI.Client/src/packages/media/dropzone/dropzone-manager.class.ts
This commit is contained in:
Niels Lyngsø
2025-03-28 13:00:56 +01:00
parent fdef134c3b 95cd6797cc
commit 1e5d29e667
32 changed files with 790 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
View File

@@ -392,6 +392,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
// Two factor providers
Services.AddUnique<ITwoFactorLoginService, TwoFactorLoginService>();
Services.AddUnique<IUserTwoFactorLoginService, UserTwoFactorLoginService>();
Services.AddUnique<IMemberTwoFactorLoginService, MemberTwoFactorLoginService>();
// Add Query services
Services.AddUnique<IDocumentRecycleBinQueryService, DocumentRecycleBinQueryService>();