Bjarke Berg
39162f0f6a
Merge conflicts resolved
2020-08-06 12:59:21 +02:00
Shannon
639c7a40ee
Merge branch 'v8/8.6' into v8/dev
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Runtime/SqlMainDomLock.cs
# src/Umbraco.Examine/IndexRebuilder.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
2020-07-20 16:03:10 +10:00
Shannon
f0dea44b4d
Adds Load Test controller to test data project (instead of just being stored in my personal repo)
2020-07-08 15:47:26 +10:00
Elitsa Marinovska
84f19e093a
NetCore: Refactor internal usages of UmbracoHelper ( #7744 )
...
* Removing properties related to IPublishedContentQuery, ITagQuery, ICultureDictionaryFactory, IUmbracoComponentRenderer from UmbracoHelper and using the corresponding private fields instead. Removing Media related methods
* Removed UmbracoHelper from UmbracoApiControllerBase
* Removed UmbracoHelper references
* Inject the needed Interfaces to classes that previously used UmbracoHelper to get the same functionality
* Fixed tests referencing UmbracoHelper
* Adding Media methods back
* Cleanup and moved UmbracoHelper from more base classes, when not used + simplified tests
* Reintroduced some methods..
* Reintroduced some methods..
* Reintroducing last missing bits
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2020-03-03 11:59:17 +01:00
Bjarke Berg
1ea39f2762
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
# src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
# src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
# src/Umbraco.Core/Packaging/ConflictingPackageData.cs
# src/Umbraco.Core/Packaging/PackagesRepository.cs
# src/Umbraco.Core/PublishedCache/PublishedMember.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
# src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
# src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
# src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/MediaTypeTreeController.cs
2020-03-02 08:34:52 +01:00
Bjarke Berg
aad8cba039
Updated projects to have C# 8 support
2020-02-24 13:37:27 +01:00
Bjarke Berg
90c2381c86
Renamed Umbraco.Abstractions to Umbraco.Core
2020-02-24 08:21:53 +01:00
abi
a7ad464b40
Remove Empty Statements
2020-02-12 15:11:18 +01:00
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
