Sebastiaan Janssen 9949e2676d Merge branch 'dev-v7' into 7.4.0 ...

Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj

2015-12-01 15:16:57 +01:00

..

AvailableCompositeContentTypesResolver.cs

WIP for model mappers to new content editor save model, udpates to js to use that

2015-10-06 17:19:08 +02:00

AvailablePropertyEditorsResolver.cs

delete fontawesome

2013-09-02 15:40:14 +02:00

ContentModelMapper.cs

fixes links so that working with vdirs works too.

2015-11-19 19:21:55 +01: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 template mapping issue when saving content types

2015-10-22 15:10:44 +02:00

ContentTypeModelMapperExtensions.cs

Replace evil magic number with constant

2015-11-12 15:32:53 +01:00

CreatorResolver.cs

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +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

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

WIP for model mappers to new content editor save model, udpates to js to use that

2015-10-06 17:19:08 +02:00

LogModelMapper.cs

merge

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

MacroModelMapper.cs

fixes unit test

2014-10-03 17:07:27 +10:00

MediaModelMapper.cs

Fixes: U4-7021 "Actions" dropdown not available to children in listview nodes

2015-10-27 18:13:18 +01:00

MemberModelMapper.cs

Updates PR with fixes for code and implementation logic for the url list.

2015-10-28 12:28:29 +01:00

OwnerResolver.cs

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02: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

PropertyTypeGroupResolver.cs

Replace evil magic number with constant

2015-11-12 15:32:53 +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

Updates PR with fixes for code and implementation logic for the url list.

2015-10-28 12:28:29 +01:00

UserModelMapper.cs

Fixes setting auth cookie during install, removes some try/catch/swallow with some error messaging, converts some String -> string and == false updates.

2015-11-26 13:07:22 +01:00