Shannon 4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 ...

Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs

2013-07-23 13:41:42 +10:00

..

mediaChooser.cs

Merge pull request #46 from michielvoo/u4-2417

2013-07-19 15:09:07 +02:00

MediaChooserScripts.Designer.cs

Upgrades required projects to .Net 4.5

2013-05-26 13:33:43 -10:00

MediaChooserScripts.resx

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

MediaPicker.js

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

MediaPickerDataType.cs

Fixed some build problems, replaces all calls to the legacy/obsolete data type factory to the DataTypesResolver and removes test for DataTypeFactoryTests.

2013-05-28 15:54:19 -10:00

MediaPickerPrevalueEditor.cs

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00