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 |
|
Bjarke Berg
|
ddb04964b5
|
https://github.com/umbraco/Umbraco-CMS/issues/7457 - We need to register the config no matter what which MB is used. The config is used to avoid execution of methods in the internal MB
|
2020-01-14 15:54:07 +01:00 |
|
Andy Butland
|
bd5b344a57
|
Merge branch 'netcore/dev' into feature/7371-short-string-helper
# Conflicts:
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/TypeExtensions.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
# src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
# src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
# src/Umbraco.Tests/Strings/StringExtensionsTests.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
# src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
# src/Umbraco.Web/Editors/CodeFileController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/CurrentUserController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MacroRenderingController.cs
# src/Umbraco.Web/Editors/MacrosController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Editors/MemberController.cs
# src/Umbraco.Web/Editors/RelationTypeController.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
# src/Umbraco.Web/Runtime/WebInitialComponent.cs
# src/Umbraco.Web/Templates/TemplateRenderer.cs
|
2019-12-24 09:08:47 +01:00 |
|
Andy Butland
|
d469a2153b
|
Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection.
|
2019-12-20 17:36:44 +01:00 |
|
Bjarke Berg
|
7f9fbe9877
|
AB4227 - Removed StringExtensions from core..
|
2019-12-18 18:55:00 +01:00 |
|
Bjarke Berg
|
28ecb355dd
|
Let IOHelper use IHostingEnvironment
|
2019-12-04 21:30:18 +01:00 |
|
Bjarke Berg
|
17e28b6840
|
AB3389 - Move the stuff from App_Plugins/ModelsBuilder into Umbraco.Web.UI.Client and handle dashboard as code.
|
2019-10-29 14:28:54 +01:00 |
|
Shannon
|
2c9939e516
|
restores the MB enable flag
|
2019-10-29 11:02:18 +11:00 |
|
Shannon
|
cd89308711
|
Ensures embedded MB is enabled on the UI proj, disables embedded MB if the legacy MB is detected
|
2019-10-29 01:14:10 +11:00 |
|
Shannon
|
3b6abbb936
|
Renames project: Umbraco.ModelsBuilder.Embedded and namespaces since we need a different assembly, updates nuspec, changes file path of MB app_plugins
|
2019-10-29 00:25:03 +11:00 |
|