Bjarke Berg
e84fcd31a1
Moved namespaces
2021-08-03 09:58:41 +02: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
Shannon
72671dbca8
Merge commit '94d525d88f713b36419f28bfda4d82ee68637d83' into v9/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/Umbraco.Core/Composing/Current.cs
# src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataModel.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializationResult.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializerEntityType.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializerFactory.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/LazyCompressedString.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
# src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComponent.cs
# src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComposer.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
# src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/NuCacheStatusController.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
# src/Umbraco.Web/Runtime/WebRuntime.cs
2021-06-24 09:43:57 -06:00
Bjarke Berg
fe36c80ba0
Merge remote-tracking branch 'origin/v8/dev' into v9/dev
...
# Conflicts:
# src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
# src/Umbraco.Core/PropertyEditors/MediaPickerWithCropsValueConverter.cs
# src/Umbraco.Core/PropertyEditors/Validators/FileExtensionConfigItem.cs
# src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfiguration.cs
# src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfig.cs
# src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfigItem.cs
# src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3Configuration.cs
# src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3ConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3PropertyEditor.cs
# src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
# src/Umbraco.Tests/Composing/TypeLoaderTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
# src/Umbraco.Tests/Services/MediaServiceTests.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.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/Cache/MemberCacheRefresher.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
2021-05-11 12:33:31 +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
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
Mole
0cc3645146
Align namespaces in Serialization to Umbraco.Cms.Infrastructure
...
This seems like some very Newtonsoft specific things, so I put it infrastructure
2021-02-15 12:42:26 +01:00
Mole
5bd8e32279
Align namespaces in Persistence
...
Made everything except for repository interface be in the Umbraco.Cms.Infrastructure.Persistence namespace
2021-02-12 13:36:50 +01:00
Mole
2d561c34e6
Align namespaces in Models to Umbraco.Cms.Core
2021-02-12 12:53:00 +01:00
Mole
511a04a62c
Align namespaces in Examine folder.
2021-02-12 10:57:50 +01:00
Mole
dd488a15f4
Move extension methods in core project to Umbraco.Extensions
2021-02-09 13:21:17 +01:00
Mole
216fb87c79
Rename Umbraco.Core namespace to Umbraco.Cms.Core
2021-02-09 10:22:42 +01: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
Paul Johnson
3f5f85880e
NetCore: MSDI refactor split CoreRuntime & Remove Current ( #9356 )
...
* Split Bootstrap code from CoreRuntime
* Make ContentService method signatures match interface
prevents need to hide the concrete class in tests
* Remove Current
Only bit that bugs me is TreeNode for IconFilePath
I get the feeling it's dead code, but can just use a setter in cs or work out path in js if required.
* Fix tests, remember to terminate IRuntime
2020-11-10 09:50:47 +01:00
Elitsa Marinovska
6d23075d9a
Migrating the rest of the files from ContentEditing\
2020-11-03 16:36:59 +01:00
Elitsa Marinovska
77544812e6
Migrating some more classes that are using EntityBasic
2020-10-29 12:45:35 +01:00
Elitsa Marinovska
c304bf07cb
Registering UdiJsonConverter globally so that we can migrate EntityBasic to Umbraco.Core
2020-10-27 15:44:11 +01:00
Elitsa Marinovska
a6e0afe57d
Migrating classes not inhering or having dependencies to EntityBasic
2020-10-27 15:42:59 +01:00
Mole
c0616d516a
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging
...
# Conflicts:
# src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
# src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
# src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
# src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
# src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs
# src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs
# src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
# src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs
# src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs
# src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs
# src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
# src/Umbraco.Web.Common/Install/InstallController.cs
2020-09-22 13:44:22 +02:00
Bjarke Berg
96facc4d35
Netcore: Introduce BackofficeSecurityAccessor ( #8871 )
...
* Introduced IWebSecurityAccessor
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
* Fixed tests
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
* Renamed WebSecurity to BackofficeSecurity and all related names
* Fixes typos
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk >
2020-09-22 10:01:00 +02:00
Mole
ab3ac5ad91
Remove a bunch of references to the old logger
2020-09-21 11:19:46 +02:00
Mole
894abdd183
Remove a bunch of references to the old logger
2020-09-21 09:41:18 +02:00
Mole
d61b9f54fa
Merge options
2020-09-18 12:53:06 +02:00
Nikolaj
120e163682
Begin trying to replace logger in Current
2020-09-16 13:46:45 +02:00
Nikolaj
488093add3
Remove LogWarning<T> from LoggerExtensions
2020-09-16 10:08:18 +02:00
Nikolaj
161061dbbc
Remove exception logging and finish LogWarning
2020-09-14 14:10:19 +02:00
Nikolaj
a1ecc4a5c9
Change Warn to LogWarning
2020-09-14 10:17:32 +02:00
Nikolaj
d7e3bce741
Rename Error to align it with MS ILogger
2020-09-14 09:10:53 +02:00
Bjarke Berg
dc643ab6a6
Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten
...
# Conflicts:
# src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
# src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
# src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
# src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
# src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
# src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
# src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
2020-09-10 14:01:38 +02:00
Bjarke Berg
fc054e6546
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
# src/Umbraco.Tests.AcceptanceTest/package.json
# src/Umbraco.Tests/TestHelpers/TestObjects.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
# src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
# src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
# src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
# src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
# src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
# src/Umbraco.Web.UI.Client/src/installer/steps/database.html
# src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
# src/Umbraco.Web.UI.Client/src/less/forms.less
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
# src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
# src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
# src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
# src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
# src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
# src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
# 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/Umbraco/config/lang/cs.xml
# src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
# src/Umbraco.Web/Editors/DictionaryController.cs
# src/Umbraco.Web/Editors/LogController.cs
# src/Umbraco.Web/Editors/MediaTypeController.cs
# src/Umbraco.Web/Editors/MemberGroupController.cs
2020-09-09 19:13:37 +02:00
Bjarke Berg
d14e2a99bc
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# .gitignore
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/ContentExtensions.cs
# src/Umbraco.Infrastructure/Intall/InstallHelper.cs
# src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
# src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
# src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
# src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
2020-09-09 14:16:46 +02:00
Bjarke Berg
e079bd5a50
Cleanup usages of Configs
2020-09-08 13:03:43 +02:00
Nikolaj
872364cfb3
Update constructor in PublishedModelFactory
2020-09-07 11:34:12 +02:00
Andy Butland
2a59a8385c
Merge branch 'netcore/netcore' into feature/8651-config-options-patten
...
# Conflicts:
# src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
# src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
# src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
2020-08-27 09:03:01 +02:00
Bjarke Berg
3d55dcd3c4
Merge remote-tracking branch 'netcore/dev' into netcore/netcore
2020-08-26 08:05:15 +02:00
Bjarke Berg
ca3f65891d
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-08-25 14:00:59 +02:00
Andy Butland
8241643183
Resolved various failing tests.
2020-08-25 12:30:43 +02:00
Andy Butland
2cd91a5a54
Converted to IOptions over IOptionsSnapshot due to the latter only working in scoped services.
...
Further amends to return to booting application.
2020-08-23 23:36:48 +02:00
Andy Butland
510bd92e78
Amended injection of further settings to use IOptionsSnapshot.
2020-08-21 14:52:47 +01:00
Andy Butland
e3a44c6717
Moved configuration setting POCOs into Umbraco.Core and adjusted references.
...
Amended injection of some settings to use IOptionsSnapshot.
2020-08-20 22:18:50 +01:00
Bjarke Berg
6371fdbf4d
post merge
2020-08-17 11:43:04 +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
adb38dceb5
Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers
2020-06-28 14:00:26 +02:00
Bjarke Berg
9d639a64b3
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
...
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
# Conflicts:
# src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
# src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
# src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
2020-06-28 13:35:25 +02:00
Bjarke Berg
2ffb01530a
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
# Conflicts:
# src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
# src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web/Compose/AuditEventsComponent.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/HtmlStringUtilities.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
2020-06-28 12:48:19 +02:00
Bjarke Berg
1a05feac02
Clean up
2020-06-25 15:23:11 +02:00
Bjarke Berg
1594a84d80
migated remaining backoffice controllers
...
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
2020-06-22 10:08:08 +02:00
Bjarke Berg
fe7d4ed3e9
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees
2020-06-17 18:05:40 +02:00
Bjarke Berg
a6b23fbfa0
Entity controller migrated
...
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
2020-06-15 13:07:49 +02:00
