Paul Johnson
235918ecfc
Merge branch 'v9/dev' into v10/feature/merge-v9-dev
...
# Conflicts:
# build/templates/UmbracoPackage/.template.config/template.json
# build/templates/UmbracoProject/.template.config/template.json
# src/Directory.Build.props
# src/Umbraco.Core/Actions/ActionAssignDomain.cs
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
# src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
# src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
# src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
2022-01-18 11:37:43 +00:00
Ronald Barendse
0ba51f87ea
Move member properties to Member Content App (V9 merge regression) ( #11768 )
...
* Fix regression after merging to v9
* Update test to align with removed member properties
2021-12-20 08:45:11 +01:00
Bjarke Berg
47c1058195
Merge remote-tracking branch 'origin/v9/dev' into v10/dev
...
# Conflicts:
# src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
2021-12-15 14:41:49 +01:00
Bjarke Berg
69b8b64b54
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_14-12-2021
...
# Conflicts:
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Core/Models/IContentType.cs
# src/Umbraco.Core/Packaging/PackageDataInstallation.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
# src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
# src/Umbraco.Core/Services/Implement/MemberService.cs
# src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
# src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.resx
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
# src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
# src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs
# src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
# src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
# src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs
# src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/Services/Importing/SingleDocType-WithCleanupPolicy.xml
2021-12-14 20:13:42 +01:00
Paul Johnson
fce97314bd
Cherry-pick: support import/export for doc type history cleanup policy ( #11708 )
...
* cherry-pick 13a51d32#11660 )
* Support import/export for doc type history cleanup policy
* Support unset/null history cleanup value
* Resolve issue when api endpoints called without cleanup policy.
noop isn't good enough as map fails for response.
* null conditional vs null coalesce assignment
* Don't overwrite existing policy if omitted in import XML
* Update history cleanup warning and translations
* Change history cleanup alert to infomational styling
* Remove margin around history cleanup config
Co-authored-by: Ronald Barendse <ronald@barend.se >
# Conflicts:
# src/Umbraco.Core/Models/IContentType.cs
# src/Umbraco.Core/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs
# src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs
# src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.resx
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/Importing/SingleDocType-WithCleanupPolicy.xml
* Remove namespace aliases
* Update IContentTypeWithHistoryCleanup documentation
Co-authored-by: Ronald Barendse <ronald@barend.se >
2021-12-02 11:37:12 +01:00
Bjarke Berg
78dc2d5721
Merge remote-tracking branch 'origin/v9/dev' into v10/dev
...
# Conflicts:
# build/azure-pipelines.yml
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# tests/Umbraco.Tests.AcceptanceTest/package-lock.json
# tests/Umbraco.Tests.AcceptanceTest/package.json
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
2021-11-22 19:43:20 +01:00
Bjarke Berg
b7d5fd4b26
Cleanup and fixed tests
2021-11-02 09:18:15 +01:00
Bjarke Berg
926c74dcba
Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup
...
# Conflicts:
# src/Umbraco.Core/Models/ContentType.cs
# src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Models/ContentEditing/HistoryCleanup.cs
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
2021-10-29 15:04:27 +02:00
Bjarke Berg
53631ee48b
Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/dev
...
# Conflicts:
# src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs
# src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/ContentEditing/HistoryCleanup.cs
# src/Umbraco.Core/Models/ContentEditing/DocumentTypeDisplay.cs
# src/Umbraco.Core/Models/ContentType.cs
# src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository.cs
# src/Umbraco.Core/Scheduling/ContentVersionCleanup.cs
# src/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs
# src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Scheduling/SchedulerComponent.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# tests/Umbraco.Tests.Common/Extensions/AutoMoqDataAttribute.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanup_Tests_UnitTests.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_Integration.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_UnitTests.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
2021-10-29 15:00:27 +02:00
Bjarke Berg
02bf61667d
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8_29-10-2021
...
# Conflicts:
# src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
2021-10-29 09:52:39 +02:00
Paul Johnson
14e1f7f7fc
V10/feature/content schedule performance ( #11398 )
...
* Nuke Content.ContentSchedule
Can't make an omelette without breaking eggs
* Fix read view models
* Fix Save, Save & Schedule, Save & Publish
* Fix scheduled publish/unpublish
* Fix unit tests
* Fix bugs & integration tests
* Cleanup action result signatures
* Update tests from #11356 , new method for saving contentschedule
2021-10-19 12:29:25 +02:00
Bjarke Berg
452097d975
Fixed issue with Paths-integers being converted using local culture. ( #11180 )
...
* Fixed issue with Paths-integers being converted using local culture.
* Align with the old implementation
* Use int.TryParse insteaad of TryConvertTo when we do not want culture specific parsing
* More fixes for cultures and fixed wrong test. Users should be part of all groups to have access
* Fix casing for requested file
* Force tests to not use NLS
* try force tests to not use NLS
* try force tests to not use NLS
* Force tests on windows to run ICU
* More fixes for invariant int parsing
* Change key on actions/emptyRecycleBin, so the casing aligns with the view file, that is named emptyrecyclebin.html
* Fixed casing issue
* use Attempt to align with other code
2021-09-24 16:42:31 +01:00
Bjarke Berg
c15c42eb83
Fixes for members
2021-09-22 23:49:16 +02:00
Bjarke Berg
f68717c1c8
Temp commit
2021-09-14 22:13:39 +02:00
Ronald Barendse
02310cb3ec
Change exposed PropertyGroupType enum from int to string values
2021-09-07 15:59:26 +02:00
Ronald Barendse
8ce4993cdc
Fix failing tests because of missing property group alias
2021-09-07 14:40:45 +02:00
Ronald Barendse
ee2da5b8ca
Merge branch 'v8/8.17' into v9/feature/merge_v8.17-rc
2021-09-07 12:10:58 +02:00
Shannon
5a1a24556e
Gets packaging scripts and partial views working and fixes packaging stylesheets and cleans things up a bit.
2021-07-08 13:11:39 -06:00
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
Mole
c9ebaadf23
Netcore: File systems rework ( #10181 )
...
* Allow IMediaFileSystem to be replace in the DI, or registered with inner filesystem
* Remove GetFileSystem from Filesystems
It was only used by tests.
* Make MediaFileSystem inherit from PhysicalFileSystem directly
* Remove FileSystemWrapper
* Remove inner filesystem from MediaFileSystem
* Add MediaFileManager and bare minimum to make it testable
* Remove MediaFileSystem
* Fix unit tests using MediaFileManager
* Remove IFileSystem and rely only on FileSystem
* Hide dangerous methods in FileSystems and do some cleaning
* Apply stylecop warnings to MediaFileManager
* Add FilesystemsCreator to Tests.Common
This allows you to create an instance if FileSystems with your own specified IFileSystem for testing purposes outside our own test suite.
* Allow the stylesheet filesystem to be replaced.
* Fix tests
* Don't save stylesheetWrapper in a temporary var
* refactor(FileSystems): change how stylesheet filesystem is registered
* fix(FileSystems): unable to overwrite media filesystem
SetMediaFileSystem added the MediaManager as a Singleton instead of
replacing the existing instance.
* fix(FileSystems): calling AddFileSystems replaces MediaManager
When calling AddFileSystems after SetMediaFileSystem the MediaManager
gets replaced by the default PhysicalFileSystem, so instead of calling
SetMediaFileSystem in AddFileSystems we now call TrySetMediaFileSystem
instead. This method will not replace any existing instance of the
MediaManager if there's already a MediaManager registered.
* Use SetMediaFileSystem instead of TrySet, and rename AddFilesystems to ConfigureFileSystems
Also don't call AddFileSystems again in ConfigureFilesystems
* Don't wrap CSS filesystem twice
* Add CreateShadowWrapperInternal to avoid casting
* Throw UnauthorizedAccessException isntead of InvalidOperationException
* Remove ResetShadowId
Co-authored-by: Rasmus John Pedersen <mail@rjp.dk >
2021-04-27 09:52:17 +02:00
Mole
51a720b16c
Add references to Umbraco.Code as PrivateAsset ( #10148 )
...
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-04-27 09:07:10 +02:00
Bjarke Berg
b3a9730442
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/MediaCacheRefresher.cs
# src/Umbraco.Core/Composing/ComponentCollection.cs
# src/Umbraco.Core/Composing/Composers.cs
# src/Umbraco.Core/Composing/TypeFinder.cs
# src/Umbraco.Core/Composing/TypeLoader.cs
# src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
# src/Umbraco.Core/Constants-SvgSanitizer.cs
# src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs
# src/Umbraco.Core/Extensions/PublishedContentExtensions.cs
# src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
# src/Umbraco.Core/Extensions/StringExtensions.cs
# src/Umbraco.Core/HealthChecks/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Core/HealthChecks/HealthCheckResults.cs
# src/Umbraco.Core/IO/FileSystems.cs
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/IO/PhysicalFileSystem.cs
# src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
# src/Umbraco.Core/Logging/DisposableTimer.cs
# src/Umbraco.Core/Logging/ILogger.cs
# src/Umbraco.Core/Logging/LogProfiler.cs
# src/Umbraco.Core/Logging/OwinLogger.cs
# src/Umbraco.Core/Manifest/ManifestWatcher.cs
# src/Umbraco.Core/Mapping/UmbracoMapper.cs
# src/Umbraco.Core/Media/UploadAutoFillProperties.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs
# src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs
# src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs
# src/Umbraco.Core/Models/Mapping/MacroMapDefinition.cs
# src/Umbraco.Core/Models/Member.cs
# src/Umbraco.Core/Packaging/PackageActionRunner.cs
# src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/EyeDropperColorPickerConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/EyeDropperColorPickerPropertyEditor.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
# src/Umbraco.Core/Templates/HtmlUrlParser.cs
# src/Umbraco.Core/UriExtensions.cs
# src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
# src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
# src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
# src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
# src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Migrations/MigrationPlan.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
# src/Umbraco.Infrastructure/PublishedCache/PublishedContentTypeCache.cs
# src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Infrastructure/Search/ExamineNotificationHandler.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextServiceFileSources.cs
# src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
# src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
# src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
# src/Umbraco.PublishedCache.NuCache/ContentStore.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
# src/Umbraco.Tests/Composing/TypeLoaderTests.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
# src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
# src/Umbraco.Tests/Services/PerformanceTests.cs
# src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
# src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
# src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
# src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs
# src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
# src/Umbraco.Web.Common/Install/InstallApiController.cs
# src/Umbraco.Web.Common/Macros/MacroRenderer.cs
# src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.controller.js
# src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.html
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/config/splashes/noNodes.aspx
# src/Umbraco.Web/AspNet/AspNetHttpContextAccessor.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/DictionaryController.cs
# src/Umbraco.Web/Editors/MemberTypeController.cs
# src/Umbraco.Web/Editors/PasswordChanger.cs
# src/Umbraco.Web/Editors/RelationTypeController.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/HttpUrlHelperExtensions.cs
# src/Umbraco.Web/HybridEventMessagesAccessor.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
# src/Umbraco.Web/Mvc/RenderMvcController.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
# src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
# src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
# src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Web/Routing/ContentFinderByUrl.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Routing/PublishedRouter.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Scheduling/TempFileCleanup.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
# src/Umbraco.Web/Trees/MemberTreeController.cs
# src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
# src/Umbraco.Web/Trees/MemberTypeTreeController.cs
# src/Umbraco.Web/UmbracoApplicationBase.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/WebApi/AngularJsonMediaTypeFormatter.cs
# src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
# src/Umbraco.Web/WebApi/UnhandledExceptionLogger.cs
2021-04-20 19:34:18 +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
8ed67aa14a
Merge branch 'netcore/members-passwordchange-temp' into netcore/members-roles-save
2021-03-12 14:39:24 +00:00
Bjarke Berg
37ed84871a
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/CacheKeys.cs
# src/Umbraco.Core/Composing/TypeFinder.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Editors/UserEditorAuthorizationHelper.cs
# src/Umbraco.Core/Extensions/StringExtensions.cs
# src/Umbraco.Core/Extensions/UriExtensions.cs
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Core/IO/PhysicalFileSystem.cs
# src/Umbraco.Core/Media/Exif/MathEx.cs
# src/Umbraco.Core/Media/UploadAutoFillProperties.cs
# src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Core/Models/Membership/User.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
# src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
# src/Umbraco.Core/Routing/AliasUrlProvider.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Routing/UriUtility.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/RuntimeOptions.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Security/BackOfficeUserStore.cs
# src/Umbraco.Core/Security/ContentPermissions.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Core/Trees/TreeNode.cs
# src/Umbraco.Core/Udi.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Examine/Umbraco.Examine.csproj
# src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
# src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
# src/Umbraco.Tests/Testing/TestDatabase.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
# src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
# src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
# src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
# src/Umbraco.Web.BackOffice/Controllers/TourController.cs
# src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
# src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web/Cache/MemberCacheRefresher.cs
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/Editors/UserGroupsController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/Logging/WebProfiler.cs
# src/Umbraco.Web/Logging/WebProfilerProvider.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/JsonNetResult.cs
# src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/RoutableDocumentFilter.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Routing/PublishedRouter.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Security/AppBuilderExtensions.cs
# src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
# src/Umbraco.Web/Trees/DictionaryTreeController.cs
# src/Umbraco.Web/Trees/LanguageTreeController.cs
# src/Umbraco.Web/Trees/LogViewerTreeController.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoApplicationBase.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
# src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
# src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
2021-03-05 15:36:27 +01: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
Mole
20a70ec133
Fix merge
2021-02-23 09:05:06 +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
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
ce43c979b5
Added MemberController unit tests. Removed TODO.
2021-01-28 11:35:02 +00: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
Emma Garland
2c006ea99f
PR comments updated. Reorganised logic. Removed unused functionality. Started to reorganise update and save roles functionality.
2020-12-09 18:36:39 +00:00
emmagarland
3f0e7ab315
Merged and updated according to shared latest work, renamed to Members instead of UmbracoMembers. Tests currently red, fixing next. Empty appsettings again.
2020-12-08 01:57:14 +00:00
emmagarland
b59935c799
Merge branch 'netcore/netcore' into netcore/members-userstore
2020-12-07 17:26:15 +00:00
Bjarke Berg
5dbddfffc5
Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore
...
# Conflicts:
# .gitignore
# src/SolutionInfo.cs
# src/Umbraco.Core/Models/PropertyType.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
# src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
2020-12-07 12:31:26 +01:00
emmagarland
f1fbeb8ad3
Set hasIdentity if there is an ID, and logical adjustments to set passwords corectly
2020-12-03 01:27:54 +00:00
emmagarland
17df4eb607
Members mapping definition updated, and commented out duplicate password work
2020-11-30 01:07:02 +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
Mole
ab3ac5ad91
Remove a bunch of references to the old logger
2020-09-21 11:19:46 +02:00
Nikolaj
dda6fb12a3
Remove LogError<T> from LoggerExtensions
2020-09-16 09:40:49 +02:00
Nikolaj
d7e3bce741
Rename Error to align it with MS ILogger
2020-09-14 09:10:53 +02:00
Bjarke Berg
c57c42d2ec
Fixes merge conflicts
2020-08-07 14:00:56 +02:00
Bjarke Berg
39162f0f6a
Merge conflicts resolved
2020-08-06 12:59:21 +02:00
Bjarke Berg
ee3615e36d
https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved controllers: TagsDataController, RteEmbedController, RichTextPreValueController, NestedContentController, WebProfilingController + Moved compose of MapDefinitionCollectionBuilder into core, and uncommented missing map definitions
2020-05-25 13:41:05 +02:00
Bjarke Berg
683c0b8732
Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext
2020-02-24 08:24:19 +01:00
Stephan
2a9072609d
Update AutoMapper to v6
2017-07-19 18:23:23 +02:00
Stephan
0597eea72b
Resvolution - Components, Runtime & Booting
2016-09-19 16:33:43 +02:00
Shannon
df9160b3cd
Removes the 'Child Container' idea (that was bad and would consume lots of mem) and instead we use Scopes. Ensures that the app event handlers are creating during a single Scope operation in the CoreBootManager. Changes MigrationBase and all sub-classes to have an IMigrationContext as a ctor param. Updates the MigrationResolver to resolve Migration instances with the passed in IMigrationContext value. Simplifies MigrationBase since now we know we have a context to work with, there's no need to GetUp/GetDown Expression methods. Updates the MigrationRunner to use the MigrationContext instead of creating one itself.
2016-05-31 23:29:15 +02:00
