Bjarke Berg c57c42d2ec Fixes merge conflicts

2020-08-07 14:00:56 +02:00

..

BackOffice

- Moved ModelsBuilder constant into Core under constants

2020-03-03 14:15:30 +01:00

Building

NetCore: Refactor config/setting to not use dependencies (#7810)

2020-03-17 16:26:56 +01:00

Compose

Changes namesspace, fixes cdf registrations, fixes bundle registrations, cleanup

2020-04-02 21:19:42 +11:00

Properties

update Umbraco.ModelsBuilder.Embedded attributes to match assembly name

2020-03-09 10:19:26 +01:00

ApiVersion.cs

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

ConfigsExtensions.cs

Merged Umbraco.Abstractions into Umbraco.Core

2020-03-03 13:42:07 +01:00

HashCombiner.cs

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

ImplementPropertyTypeAttribute.cs

https://github.com/umbraco/Umbraco-CMS/issues/7469 Unsealed class to allow override

2020-01-24 09:20:16 +01:00

LiveModelsProvider.cs

Merged Umbraco.Abstractions into Umbraco.Core

2020-03-03 13:42:07 +01:00

LiveModelsProviderModule.cs

AB3677 - Removed the Core.Composing.Current.. Moved stuff to Web.Composing.Current and injected more stuff.

2020-01-07 13:08:21 +01:00

ModelsBuilderAssemblyAttribute.cs

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

ModelsBuilderDashboard.cs

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

ModelsGenerationError.cs

NetCore: Refactor config/setting to not use dependencies (#7810)

2020-03-17 16:26:56 +01:00

OutOfDateModelsStatus.cs

NetCore: Refactor config/setting to not use dependencies (#7810)

2020-03-17 16:26:56 +01:00

PublishedElementExtensions.cs

https://github.com/umbraco/Umbraco-CMS/issues/7469 Renamed extension method to avoid ambiguous signature

2020-01-24 09:19:29 +01:00

PublishedModelUtility.cs

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

PureLiveModelFactory.cs

Merge conflicts resolved

2020-08-06 12:59:21 +02:00

ReferencedAssemblies.cs

Merge remote-tracking branch 'origin/v8/feature/AB3348-MB-lite-cleanup' into v8/feature/AB3289-MB-allow-legacy

2019-10-29 11:15:45 +01:00

TypeExtensions.cs

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

Umbraco.ModelsBuilder.Embedded.csproj

Fixes merge issues with Umbraco.Web.UI and ensures we are using a consistent version of System.ComponentModel.Annotations

2020-05-20 10:59:09 +10:00

UmbracoServices.cs

Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection.

2019-12-20 17:36:44 +01:00