Mads Rasmussen 51ed441b85 Merge branch 'u4-5123' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5123 ...

# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs

2016-02-18 10:00:22 +01:00

..

AvailablePropertyEditorsResolver.cs

abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though.

2016-01-21 15:01:55 +01:00

ContentModelMapper.cs

Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

2016-01-06 12:54:19 +01:00

ContentPropertyBasicConverter.cs

…

ContentPropertyDisplayConverter.cs

…

ContentPropertyDtoConverter.cs

…

ContentPropertyModelMapper.cs

…

ContentTypeModelMapper.cs

putting back in ContentTypeId on PropertyTypeDisplay, turns out this IS used when we remove a composition, we need to know which properties are related to which type. have also fixed another potential bug regarding compositions + generic properties, before we were not setting the ContentTypeId correct for a composition property type on the generic properties tab.

2016-02-10 14:34:33 +01:00

ContentTypeModelMapperExtensions.cs

Fixes: U4-7691 - refactor

2016-02-03 15:39:18 +01:00

CreatorResolver.cs

…

DatabaseTypeResolver.cs

…

DataTypeModelMapper.cs

Gets data type folders working/creating, data types being able to be created in folders, tree syncing with data type paths, fixes up some localization stuff and fixes up some issues with media type folders with parent ids

2015-11-12 18:59:43 +01:00

EntityModelMapper.cs

Reverting code to add additional meta data on compositions.

2016-01-11 12:07:36 +01:00

LockedCompositionsResolver.cs

Removed adding compositions from parents as this breaks core functionality.

2016-01-11 12:07:38 +01:00

LogModelMapper.cs

…

MacroModelMapper.cs

…

MediaModelMapper.cs

Fixes the URL creating for media in the back office to use an IMedia instead of published media (since it's not published yet at the time)

2016-02-11 15:54:00 +01:00

MemberModelMapper.cs

U4-5168 Media Items label says "Document Type" instead of "Media Type"

2016-01-06 11:22:15 +01:00

OwnerResolver.cs

…

PreValueDisplayResolver.cs

…

PropertyGroupDisplayResolver.cs

cleans up more mappings, adds unit tests

2016-01-21 15:59:58 +01:00

PropertyTypeGroupResolver.cs

putting back in ContentTypeId on PropertyTypeDisplay, turns out this IS used when we remove a composition, we need to know which properties are related to which type. have also fixed another potential bug regarding compositions + generic properties, before we were not setting the ContentTypeId correct for a composition property type on the generic properties tab.

2016-02-10 14:34:33 +01:00

RelationModelMapper.cs

…

SectionModelMapper.cs

…

TabModelMapper.cs

…

TabsAndPropertiesResolver.cs

Merge branch 'u4-5123' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5123

2016-02-18 10:00:22 +01:00

UserModelMapper.cs

U4-7821 KeepUserLoggedIn with a long umbracoTimeOutInMinutes has logout issues

2016-02-02 15:14:47 +01:00