Bjarke Berg
23293b77f6
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8-05072021
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
# src/Umbraco.Core/Composing/Current.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Constants-SqlTemplates.cs
# src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
# src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
# src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
# src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs
# src/Umbraco.Core/Models/IReadOnlyContentBase.cs
# src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
# src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
# src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
# src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
# src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
# src/Umbraco.Core/PropertyEditors/MediaPicker3Configuration.cs
# src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
# src/Umbraco.Core/PropertyEditors/PropertyCacheCompression.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/Services/ILocalizedTextService.cs
# src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Examine/UmbracoContentIndex.cs
# src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
# src/Umbraco.Infrastructure/IPublishedContentQuery.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Models/MediaWithCrops.cs
# src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
# src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfiguration.cs
# src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs
# src/Umbraco.Infrastructure/PublishedContentQuery.cs
# src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
# src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
# src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
# src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
# src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
# src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs
# src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
# src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs
# src/Umbraco.Web.Common/Macros/MacroRenderer.cs
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Compose/NotificationsComponent.cs
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/CurrentUserController.cs
# src/Umbraco.Web/Editors/DictionaryController.cs
# src/Umbraco.Web/Editors/MediaTypeController.cs
# src/Umbraco.Web/Editors/MemberController.cs
# src/Umbraco.Web/Editors/MemberGroupController.cs
# src/Umbraco.Web/Editors/MemberTypeController.cs
# src/Umbraco.Web/Editors/NuCacheStatusController.cs
# src/Umbraco.Web/Editors/UserGroupsController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/CompilationDebugCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/CustomErrorsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/MacroErrorsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/TraceCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/TrySkipIisCustomErrorsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
# src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
# src/Umbraco.Web/Models/Trees/MenuItemList.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataModel.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
# src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
# src/Umbraco.Web/Runtime/WebRuntime.cs
# src/Umbraco.Web/Search/ExamineComponent.cs
# src/Umbraco.Web/Trees/ApplicationTreeController.cs
# src/Umbraco.Web/Trees/MemberTreeController.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
2021-07-05 20:58:04 +02:00
Shannon
db3dc01321
removes todos, reverts tree controller, fixes up review notes.
2021-03-26 14:18:41 +11:00
Emma Garland
8535a2915c
Changed wording, PR feedback
2021-03-12 15:21:56 +00:00
Emma Garland
e124ee336a
Deleted MembersRoleProvider. Switched to role store. Made everything single not plural. Fixed formatting.
2021-03-04 17:29:11 +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
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
Emma Garland
d285f626a0
Pull request peer review changes - renamed password method, removed unneeded non-strongly typed Member GetAllRoles() method, removed duplicate Normalizer test and rename normalizer, removed currently unneeded events on MembersUserManager. Fixed namespaces and ensured tests in correct location.
2021-01-11 14:24:49 +00:00
Shannon
99247d7fbe
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller
...
# Conflicts:
# src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
2020-11-18 16:02:51 +11:00
Elitsa Marinovska
dd5f400cf3
Netcore: Migration of Model classes from Umbraco.Infrastructure to Core ( #9404 )
...
* Migrating more model, mapping and tree classes
* Migrating files from Mapping dir without Newtonsoft dependency
* Migrating files from PublishedContent and Editors dirs without Newtonsoft dependency + some more of the same kind
* Migrating DataType class without the usage of Newtonsoft.Json and making the corresponding changes to all classes affected
* Combining 3 ContentExtensions files into 1
* Refactoring from migrating ContentExtensions
* Migrating more classes
* Migrating ContentRepositoryExtensions - combining it with existing file in Umbraco.Core
* removing Newtonsoft json dependency & migrating file. Adding partial migration of ConfigurationEditor, so PropertyTagsExtensions can be migrated
* Migrating ContentTagsExtensions, and refactoring from changes in PropertyTagsExtensions
* Changes that should be reverted once ConfigurationEditor class is fully migrated
* VS couldn't find Composing, so build was failing. Removing the using solves the problem
* Handling a single case for deserializing a subset of an input
* Small changes and added tests to JsonNetSerializer
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
* Migrated ConfigurationEditor
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2020-11-17 20:27:10 +01:00
