Emma Garland
|
034b080c41
|
Don't rename, too many file changes
|
2021-02-26 14:52:54 +00:00 |
|
Emma Garland
|
bce27c1fe4
|
Reverted name change
|
2021-02-26 14:33:27 +00:00 |
|
Emma Garland
|
525d14ed25
|
Updated to set correct properties
|
2021-02-26 14:21:23 +00:00 |
|
Emma Garland
|
c36aaabd0e
|
Updated to move the logic for whether the password change can occur, into the controller,
|
2021-02-26 12:42:18 +00:00 |
|
Emma Garland
|
8f392c252a
|
Merge branch 'netcore/dev' into netcore/members-passwordchange-temp
# Conflicts:
# src/Umbraco.Core/Models/ChangingPasswordModel.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.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/UmbracoBuilderExtensions.cs
# src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs
|
2021-02-26 11:12:34 +00:00 |
|
Bjarke Berg
|
5b88fbe970
|
Merge pull request #9899 from umbraco/netcore/bugfix/packages-with-actions
Netcore: Fix packages with actions
|
2021-02-26 10:34:14 +01:00 |
|
Shannon
|
f6cf089357
|
Fix a missed namespace change
|
2021-02-26 15:14:42 +11:00 |
|
Shannon
|
3113efd122
|
Adds common.views to view imports
|
2021-02-26 14:11:00 +11:00 |
|
Shannon
|
b21db82929
|
missed change for default namespace in the UI project
|
2021-02-26 14:08:57 +11:00 |
|
Shannon
|
a597f5d473
|
removes perfolizer dll reference - it has a package reference
|
2021-02-26 13:42:03 +11:00 |
|
Mole
|
70b04e8a8a
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/packages-with-actions
|
2021-02-25 13:48:16 +01:00 |
|
Mole
|
f4787f9ae5
|
Add undo actions to the root node instead of appending them
also fix minor UI bug
|
2021-02-25 12:36:28 +01:00 |
|
Bjarke Berg
|
01bf937497
|
Merge pull request #9741 from umbraco/netcore/feature/AB10074-fix-createmember-and-createcontent
NetCore: Fix CreateMember and CreateContent methods
|
2021-02-25 09:47:57 +01:00 |
|
Bjarke Berg
|
0c5a1fb648
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10074-fix-createmember-and-createcontent
# Conflicts:
# src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
|
2021-02-25 08:14:42 +01:00 |
|
Bjarke Berg
|
1399fbabe4
|
Reuse save methods..
|
2021-02-25 08:08:02 +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 |
|
Bjarke Berg
|
23f2b091ad
|
Updated v8 version number in js docs
|
2021-02-23 13:42:52 +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
|
bc17b7463d
|
Added test of AddOrUpdateClaim
|
2021-02-23 10:52:55 +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 |
|
Mole
|
20a70ec133
|
Fix merge
|
2021-02-23 09:05:06 +01:00 |
|
Bjarke Berg
|
7ecb141581
|
Merge pull request #9855 from kjac/netcore/feature/clean-up-umbraco-builder-extensions
Remove obsolete method in UmbracoBuilderExtensions
|
2021-02-23 08:54:37 +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 |
|
Bjarke Berg
|
f0ad6ca1d5
|
Merge pull request #9854 from kjac/netcore/feature/cleanup-migration-expression
Removed unused method from migration expression interface
|
2021-02-23 08:51:48 +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 |
|
Bjarke Berg
|
d91621282c
|
Merge pull request #9853 from kjac/netcore/feature/io-helper-cleanup
Clean up the IO Helper interface
|
2021-02-23 08:50:02 +01:00 |
|
Bjarke Berg
|
f57e9393b9
|
Merge pull request #9851 from kjac/netcore/feature/clean-up-obsolete-config
Remove obsolete configuration references
|
2021-02-23 08:47:23 +01:00 |
|
Bjarke Berg
|
55eb64de17
|
Merge pull request #9850 from kjac/netcore/feature/remove-legacy-cache-refresher
Remove legacy member cache refresher and unused base class
|
2021-02-23 08:45:49 +01:00 |
|
Mole
|
f1128d7d70
|
Replace usage of Thread.CurrentPrincipal with IBackofficeSecurityAccessor
|
2021-02-23 08:38:27 +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
|
c35af99030
|
Reverted appsettings
|
2021-02-22 20:57:41 +00: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
|
9123c06aec
|
Fixed issue with /~ folder created doing install
|
2021-02-22 12:51:17 +01:00 |
|
Bjarke Berg
|
bf936cbd65
|
Fix namespaces when building MB models
|
2021-02-22 10:32:09 +01:00 |
|
Bjarke Berg
|
890cd45677
|
Fix namespace
|
2021-02-22 10:09:20 +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 |
|
emmagarland
|
f62b7cbf4a
|
Merged from dev
|
2021-02-20 19:56:35 +00:00 |
|
Emma Garland
|
0a10d3176d
|
Initial changes to password model
|
2021-02-20 19:16:31 +00:00 |
|
Emma Garland
|
0fe7ad826d
|
Updated membership successful result as per PR comments
|
2021-02-19 17:03:48 +00:00 |
|
Kenn Jacobsen
|
7d1ecf5c22
|
Move implementation of obsolete method in UmbracoBuilderExtensions to TestHelper
|
2021-02-19 17:21:38 +01:00 |
|