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

InfrastructureSettings

Fix weird merge issues

2013-01-31 14:35:18 -01:00

CaseInsensitiveEnumConfigConverter.cs

Core. and Web.Configuration - go public

2013-03-01 13:56:12 -01:00

ClientDependencyConfiguration.cs

#U4-1246 Increase the version number in ClientDependency.config after install

2012-12-12 09:07:06 -01:00

ConfigurationKeyAttribute.cs

Core.Configuration - simplify