Bjarke Berg
|
2baa1abfc4
|
Merge remote-tracking branch 'origin/v8/8.16' into v9/feature/merge_v8_11082021
# Conflicts:
# .github/CONTRIBUTING.md
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.Web.nuspec
# build/NuSpecs/UmbracoCms.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/AppCaches.cs
# src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs
# src/Umbraco.Core/Cache/DeepCloneAppCache.cs
# src/Umbraco.Core/Cache/WebCachingAppCache.cs
# src/Umbraco.Core/CompositionExtensions.cs
# src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
# src/Umbraco.Core/Models/PropertyGroupCollection.cs
# src/Umbraco.Core/Models/PropertyTypeCollection.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
# src/Umbraco.Core/ReadLock.cs
# src/Umbraco.Core/Routing/SiteDomainMapper.cs
# src/Umbraco.Core/UpgradeableReadLock.cs
# src/Umbraco.Core/WriteLock.cs
# src/Umbraco.Examine/ExamineExtensions.cs
# src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
# src/Umbraco.Infrastructure/Persistence/Dtos/ContentTypeDto.cs
# src/Umbraco.Infrastructure/Persistence/Dtos/DictionaryDto.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
# src/Umbraco.Infrastructure/Services/IdKeyMap.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
# src/Umbraco.Web.UI.Client/package.json
# 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.Web.UI.csproj
# src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/CacheHelperExtensions.cs
# src/Umbraco.Web/Editors/RelationTypeController.cs
# src/Umbraco.Web/Logging/WebProfilerProvider.cs
# src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
# src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs
# src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Security/BackOfficeUserManager.cs
# src/Umbraco.Web/Umbraco.Web.csproj
|
2021-08-11 19:11:35 +02:00 |
|
Bjarke Berg
|
43ae1fa3e4
|
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_dev_03082021
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/ContentEditing/ContentTypesByKeys.cs
# src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
# src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
# src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
# src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
# src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
# src/Umbraco.Web/PublishedCache/NuCache/NuCacheSerializerComponent.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
|
2021-08-03 09:48:34 +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 |
|