Umbraco-CMS

Files

Shannon 66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs

2013-07-31 18:52:14 +10:00

Properties

Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies

2012-11-26 07:46:29 -01:00

RazorCore

imported patches for pull request spudstuff/u4497

2013-03-11 18:49:45 +06:00

RazorDataTypeModels

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

RazorDynamicNode

Cleanup of unused using statements in a few files