Shannon 371b1817ea Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias ...

Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs

2013-09-17 00:27:17 +10:00

..

Binders

Fixes up more permissions checks, refactors MediaController.PostAddFile to use the correct WebAPI usage. Fixes issue with UmbracoClientManager throwing errors because the treeProps didn't include all called props.

2013-09-03 16:35:36 +10:00

Filters

Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-11 13:07:22 +10:00

ControllerContextExtensions.cs

First attempt at getting legacy tree dialog to work with new trees. Just saving this revision since I might need to reference the code later but am going to revert since this doesn't seem like the way to go.

2013-09-04 12:01:41 +10:00

CustomDateTimeConvertor.cs

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

HttpRequestMessageExtensions.cs

Streamlined response messages and http codes for validation and authorization all relating to U4-2749 Fix auth filters to return 401 when not logged in and 403 when the user has no access

2013-09-10 15:37:44 +10:00

MemberAuthorizeAttribute.cs

Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

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

UmbracoApiController.cs

merge branch '6.2.0' into '7.0.0'

2013-09-12 13:09:04 +02:00

UmbracoApiControllerResolver.cs

…

UmbracoAuthorizeAttribute.cs

Got more of the sorting stuff working, started implementing much of the back office security checks in the content controller, updates some of the c# unit tests and got a self-hosted test running (but commented out currently until we can mock things properly).

2013-08-07 19:28:32 +10:00

UmbracoAuthorizedApiController.cs

Changed WebSecurity to expose IUser instead of User, then fixed up the knock-on effect, obsoleted all calls to the legacy User object in the base classes to point to use the WebSecurity class to access the new user object.

2013-08-09 13:24:26 +10:00

WebApiHelper.cs

First attempt at getting legacy tree dialog to work with new trees. Just saving this revision since I might need to reference the code later but am going to revert since this doesn't seem like the way to go.

2013-09-04 12:01:41 +10:00