yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,527 Commits 4 Branches 7 Tags
a67f7fad6fe8722133dba0a756ba06efab7e50fe
Commit Graph

711 Commits

Author SHA1 Message Date
Bjarke Berg
a67f7fad6f Merge pull request #9881 from kjac/netcore/feature/remove-treecontroller-static-events 
Replace static events in TreeControllerBase with IEventAggregator notifications
 2021-03-01 10:24:20 +01:00
berg
d7d99e5c00 Fixed issue found by cypress test. script/css folders was not deleted because it search in contentroot and not wwwroot 2021-02-27 19:26:36 +01:00
Mole
0a2efc252f Re introduce cookie check, but adding return statement 2021-02-24 13:20:53 +01:00
Mole
2fcae1cc28 Fix installing packages. 2021-02-24 12:54:30 +01:00
Kenn Jacobsen
0393a54abf Postfixed notifications with "Notifications" for improved discoverability 2021-02-24 08:56:41 +01:00
Kenn Jacobsen
b1aabade55 Formatting and comments 2021-02-23 16:20:22 +01:00
Kenn Jacobsen
b05d71f76c Replaced static events in TreeControllerBase with IEventAggregator notifications 2021-02-23 16:09:36 +01:00
Bjarke Berg
ef4e2eb511 Renamed service implementations namespace to Core 2021-02-23 12:24:51 +01:00
Bjarke Berg
dc4595b16a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces 
# Conflicts:
#	src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
 2021-02-23 12:07:22 +01:00
Bjarke Berg
d641e375c5 Merge pull request #9833 from umbraco/9622-remove-backofficeidentity 
Netcore: Remove UmbracoBackOfficeIdentity
 2021-02-23 11:29:23 +01:00
Bjarke Berg
bbaba0c542 Add or update the TicketExpiresClaimType claim, to ensure its not added multiple times, now that is can be there after a clone. 2021-02-23 10:07:17 +01:00
Mole
36d6ab2213 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces 
# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Expressions/Rename/Expressions/RenameColumnExpression.cs
#	src/Umbraco.Infrastructure/Migrations/IMigrationExpression.cs
 2021-02-23 09:06:31 +01:00
Bjarke Berg
73010dece5 Merge pull request #9852 from kjac/netcore/feature/umbraco-version-current-rename 
Rename UmbracoVersion.Current to UmbracoVersion.Version
 2021-02-23 08:53:19 +01:00
Mole
159747ab61 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces 
# Conflicts:
#	src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Infrastructure/Security/IBackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/Security/IUmbracoUserManager.cs
#	src/Umbraco.Infrastructure/Security/SignOutAuditEventArgs.cs
#	src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
#	src/Umbraco.Infrastructure/Security/UserInviteEventArgs.cs
#	src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
#	src/Umbraco.Web/Security/IBackOfficeUserPasswordChecker.cs
#	src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs
 2021-02-23 08:51:09 +01:00
Mole
9d0493d38f Merge remote-tracking branch 'origin/netcore/dev' into 9622-remove-backofficeidentity 
# Conflicts:
#	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
 2021-02-23 08:29:03 +01:00
Emma Garland
2109bee83b Merge branch 'netcore/dev' into netcore/members-userstore 
# Conflicts:
#	src/Umbraco.Core/Models/Membership/IMembershipUser.cs
#	src/Umbraco.Core/Models/Membership/IUser.cs
#	src/Umbraco.Core/Services/IMembershipRoleService.cs
#	src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
#	src/Umbraco.Infrastructure/Security/IBackOfficeUserPasswordChecker.cs
#	src/Umbraco.Infrastructure/Security/IUmbracoUserManager.cs
#	src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
#	src/Umbraco.Infrastructure/Security/SignOutAuditEventArgs.cs
#	src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
#	src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
#	src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
#	src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
#	src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs
#	src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.BackOffice/Security/IBackOfficeSignInManager.cs
#	src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs
#	src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/Middleware/BootFailedMiddleware.cs
#	src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/MembershipHelper.cs
#	src/Umbraco.Web/Security/MembershipProviderBase.cs
#	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
#	src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs
#	src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
 2021-02-22 20:55:12 +00:00
Mole
8f21fb5492 Fix Merge 2021-02-22 15:46:46 +01:00
Mole
1c1394e0bf Replace usages of ClaimsIdentityExtensions.Issuer with Constants.Security.BackOfficeAuthenticationType 
Also remove todo and cases of using ClaimsIdentityExtensions = Umbraco.Extensions.ClaimsIdentityExtensions;
 2021-02-22 15:31:25 +01:00
Mole
405d0e704d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces 
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
 2021-02-22 15:18:04 +01:00
Bjarke Berg
c453719c2d Fix the register of the IModelsBuilderDashboardProvider 2021-02-22 09:49:24 +01:00
Bjarke Berg
6e89e9a8a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10314-mb-embedded-dependencies 
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/ApiVersion.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/ModelsGenerator.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/PropertyModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextHeaderWriter.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModelHasher.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/LiveModelsProvider.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderAssemblyAttribute.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsGenerationError.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/OutOfDateModelsStatus.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/RoslynCompiler.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/TypeExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/UmbracoServices.cs
#	src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
#	src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
#	src/Umbraco.Web.Common/ModelsBuilder/RefreshingRazorViewEngine.cs
#	src/Umbraco.Web.Common/ModelsBuilder/UmbracoAssemblyLoadContext.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
 2021-02-22 09:00:33 +01:00
Mole
63c8365e6a Fix merge and consolidate ClaimsIdentityExtensions into one file. 2021-02-22 08:51:37 +01:00
Mole
d413bf49f9 Merge remote-tracking branch 'origin/netcore/dev' into 9622-remove-backofficeidentity 
# Conflicts:
#	src/Umbraco.Core/Security/AuthenticationExtensions.cs
#	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs
#	src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
#	src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
 2021-02-22 08:38:12 +01:00
Emma Garland
0fe7ad826d Updated membership successful result as per PR comments 2021-02-19 17:03:48 +00:00
Kenn Jacobsen
764014fd63 Rename UmbracoVersion.Current to UmbracoVersion.Version 2021-02-19 14:26:55 +01:00
Mole
bf41c2eeaa Netcore: Align namespaces (#9801) 
* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
 2021-02-18 11:06:02 +01:00
Elitsa Marinovska
4bccb995ec Introducing IModelsBuilderDashboardProvider 2021-02-18 08:27:35 +01:00
Elitsa Marinovska
570d19f298 Migrating classes to Web.BackOffice proj 2021-02-18 08:21:48 +01:00
Mole
ce5eaac5a4 Merge branch 'netcore/feature/align-namespaces' into netcore/feature/align-infrastructure-namespaces 
# Conflicts:
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
 2021-02-17 15:44:36 +01:00
Mole
738150f5ad Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces 
# Conflicts:
#	src/Umbraco.Core/IO/ViewHelper.cs
#	src/Umbraco.Core/Models/ContentModel.cs
#	src/Umbraco.Core/Models/ContentModelOfTContent.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
#	src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs
#	src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs
#	src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs
#	src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs
#	src/Umbraco.Web.Common/Controllers/RenderController.cs
#	src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
#	src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
#	src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
 2021-02-17 15:35:44 +01:00
Mole
8ba3f7ccb4 Remove UmbracoBackOfficeIdentity 2021-02-17 14:21:59 +01:00
Mole
b9d61f3ad8 Gut UmbracoBackOfficeIdentity 2021-02-17 14:17:38 +01:00
Bjarke Berg
88acb07873 Merge pull request #9821 from umbraco/netcore/task/9716-custom-routes 
Custom controller routes within an Umbraco context (i.e. virtual nodes)
 2021-02-17 12:29:20 +01:00
Bjarke Berg
2ba3eb436c Fixed up small findings in refiew.. 
- Uses ILogger<T> instead of ILoggerFactory
- Uses the GetControllerName extension
- Fixes views
 2021-02-17 12:00:57 +01:00
Mole
33a99df73f Remove usage of FromClaimsIdentity 2021-02-17 11:50:19 +01:00
Mole
80716a18d2 Fix mistaken use of GetId() 2021-02-17 10:16:00 +01:00
Mole
a87075a941 Switch simple properties to extension methods 2021-02-17 10:11:04 +01:00
Mole
efe4162027 Align Umbraco.Examine.Lucene to Umbraco.Cms.Infrastructure.Examine 
The namespace has to be the same as in Infrastructure/Examine otherwise linux build fails.
 2021-02-15 14:45:02 +01:00
Bjarke Berg
9ba04c394b Added Directory.Build.props to replace SolutionInfo 2021-02-15 13:53:06 +01:00
Mole
7e791f3fe7 Align namespaces in Packaging to Umbraco.Cms.Core 
And fix tests
 2021-02-15 13:44:18 +01:00
Mole
eb091f8dcd Align namespaces in root of infrastructure 2021-02-15 13:14:18 +01:00
Mole
7f58b3479b Align namespaces in WebAssets to Umbraco.Cms.Infrastructure 2021-02-15 13:07:12 +01:00
Mole
f0362d4790 Align namespaces in Trees to Umbraco.Cms.Core 2021-02-15 12:57:58 +01:00
Mole
33c8396ad2 Align namespaces in Services to Umbraco.Cms.Infrastructure 2021-02-15 12:51:42 +01:00
Mole
30b086d5d0 Align namespaces in Security to Umbraco.Cms.Core 2021-02-15 12:01:12 +01:00
Mole
9733072f24 Align namespaces in Search to Umbraco.Cms.Infrastructure 2021-02-15 11:45:27 +01:00
Mole
48e1ba2127 Align namespaces in Scoping to Umbraco.Cms.Core 2021-02-15 11:41:12 +01:00
Mole
2ccb97b951 Merge branch 'netcore/feature/align-namespaces' into netcore/feature/align-infrastructure-namespaces 2021-02-15 08:50:30 +01:00
Shannon
4f2682678e Gets virtual page routing working, now just need to document. 2021-02-15 18:50:16 +11:00
Mole
5ef01d0e5c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces 
# Conflicts:
#	src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
#	src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
 2021-02-15 08:46:46 +01:00