Bjarke Berg
|
1bfb64bdd8
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Abstractions/Constants-AppSettings.cs
# src/Umbraco.Abstractions/ContentVariationExtensions.cs
# src/Umbraco.Abstractions/IMainDom.cs
# src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
# src/Umbraco.Abstractions/Runtime/IMainDom.cs
# src/Umbraco.Abstractions/Runtime/MainDom.cs
# src/Umbraco.Core/IMainDom.cs
# src/Umbraco.Core/MainDom.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Infrastructure/MainDom.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoComponentRenderer.cs
|
2020-01-23 13:16:49 +01:00 |
|
Ronald Barendse
|
6c2e1b29fd
|
Use SetVariesBy extension methods instead of SetFlag/UnsetFlag
|
2020-01-22 11:10:56 +01:00 |
|
Bjarke Berg
|
d7377bd9b4
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DataTypeController.cs
# src/Umbraco.Web/Editors/MacrosController.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
|
2020-01-21 10:51:04 +01:00 |
|
Shannon
|
be38b96391
|
fixes up the AddSegmentData endpoint
|
2020-01-21 13:52:53 +11:00 |
|
Shannon
|
8cc78631a0
|
Adds TestData project along with test endpoints for enabling/disabling segments
|
2020-01-21 13:33:39 +11:00 |
|