Shannon 24e2547656 Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b ...

# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs

2017-05-04 18:29:43 +10:00

..

AvailablePropertyEditorsResolver.cs

Adds new property to PropertyEditor's to mark them as deprecated so they don't show up in the data type list unless they are already selected

2017-01-17 18:54:50 +11:00

CodeFileDisplayMapper.cs

Fixes mappings

2017-04-28 13:34:32 +10:00

ContentModelMapper.cs

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6

2017-03-29 18:11:51 +11:00

ContentPropertyBasicConverter.cs

Changes imagecropper to store config in its property data

2014-02-19 00:19:15 +01:00

ContentPropertyDisplayConverter.cs

allows for client side validation on the text box and date picker controls and updates the models to allow support for this for any prop editor.

2014-03-18 15:29:14 +11:00

ContentPropertyDtoConverter.cs

Changed method signatures of some of the conversion methods on the PropertyValueEditor to make it more flexible for developers to do what they want.

2013-11-19 11:51:01 +11:00

ContentPropertyModelMapper.cs

Fixes: U4-4610 Unmapped members in Automapper

2014-04-14 15:20:02 +10:00

ContentTypeModelMapper.cs

Fixes mappings

2017-04-28 13:34:32 +10:00

ContentTypeModelMapperExtensions.cs

Fixes mappings

2017-04-28 13:34:32 +10:00

ContentTypeUdiResolver.cs

Fixes up issues reported on review and adds a null check

2017-02-03 11:49:22 +11:00

CreatorResolver.cs

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

DashboardModelsMapper.cs

tmp

2016-09-02 14:44:16 +02:00

DatabaseTypeResolver.cs

more work on removing the GUID requirement for prop editors, removes legacy editDataType webforms editor (U4-2801 Remove legacy/un-used editDataType.aspx webforms editor)

2013-09-06 15:27:38 +10:00

DataTypeModelMapper.cs

Fixes mappings

2017-04-28 13:34:32 +10:00

EntityModelMapper.cs

Gets the member picker working with mini list views, falls back to Examine search for when searching on member types - since the EntityService doesn't support that currently, gets the icon mapped correctly for members,

2017-02-21 13:49:58 +11:00

LockedCompositionsResolver.cs

Removed adding compositions from parents as this breaks core functionality.

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

MacroModelMapper.cs

U4-9762 ezSearch package complains about pickers in macro parameters

2017-04-12 13:39:38 +02:00

MediaModelMapper.cs

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6

2017-03-29 18:11:51 +11:00

MemberModelMapper.cs

Fixes mappings

2017-04-28 13:34:32 +10:00

OwnerResolver.cs

Updates the base editor models to include a readonly UDI, updates all model mappers to map the UDI,

2017-01-28 01:14:24 +11:00

PreValueDisplayResolver.cs

Fixing: U4-3687 Umbraco 7 Packaging Issues - have fixed the data type package issues, cleaned up some code and fixed a different underlying pre-val issue for empty legacy aliases

2013-11-28 16:57:05 +11:00

PropertyGroupDisplayResolver.cs

cleans up more mappings, adds unit tests

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

PropertyTypeGroupResolver.cs

U4-8175 - fix PropertyType.PropertyGroupId inconsistencies

2016-03-16 13:41:58 +01:00

RelationModelMapper.cs

Updes more code for U4-337

2015-01-06 15:36:14 +11:00

SectionModelMapper.cs

The section mapping was reversed, so werent translated

2013-11-28 13:20:52 +01:00

TabModelMapper.cs

merge

2013-11-07 17:16:22 +01:00

TabsAndPropertiesResolver.cs

Fix U4-9298

2016-12-17 21:12:45 -05:00

TemplateModelMapper.cs

Fixes mappings

2017-04-28 13:34:32 +10:00

UserModelMapper.cs

Removed user types and migrated them to groups. Returned to compiling state.

2016-10-28 09:20:52 +02:00