Shannon 02a903f77b Merge remote-tracking branch 'origin/dev-v7' into dev-v8 ...

Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/umbraco.MacroEngines/RazorDynamicNode/DynamicBackingItem.cs
	src/umbraco.MacroEngines/app.config
	src/umbraco.MacroEngines/packages.config
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.editorControls/app.config
	src/umbraco.editorControls/packages.config
	src/umbraco.editorControls/umbraco.editorControls.csproj
	src/umbraco.providers/app.config

2015-01-19 13:11:51 +11:00

..

AvailablePropertyEditorsResolver.cs

delete fontawesome

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

ContentModelMapper.cs

removes some usages of singletons

2015-01-05 10:01:58 +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

Added member type controller and resource, started getting creating members dialog working.

2013-10-08 17:49:40 +11: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

WIP WIP WIP. Started working on U4-5648 which led to quite a lot of other things, once IDataType was removed (U4-5858), this lead to U4-5546, U4-5416, U4-5484, U4-5805. So much of this stuff is etched deep into the codebase, so nice to get rid of it. Had to remove the codefirst tests too for now since they relied on old apis and we don't really support it/use it. Commented out all of the code relating to the document type editor UI bits since they need to be rewritten and removed.

2014-11-21 16:34:47 +11:00

EntityModelMapper.cs

Fixes: U4-5694 When searching in a picker, the filtering rules are ignored

2014-10-28 15:23:05 +10: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

Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections.

2014-10-02 19:55:24 +10:00

MemberModelMapper.cs

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

2015-01-19 13:11:51 +11: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

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

Merge branch 'umbukfest-U4-4731' of https://github.com/tompipe/Umbraco-CMS into tompipe-umbukfest-U4-4731

2014-11-21 09:25:57 +11:00

UserModelMapper.cs

Fixes: U4-5597 ServerVariables cannot include dynamic data like a users start node Ids

2014-10-07 14:59:07 +11:00