Shannon f7e7687f27 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 ...

Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs

2013-08-29 15:18:19 +10:00

..

AreaRegistrationExtensions.cs

Merge branch '6.0.7' into 6.1.2

2013-06-18 15:13:43 +10:00

BackOfficeArea.cs

Gets the back office routing to /umbraco again.

2013-07-23 13:33:37 +10:00

Constants.cs

Merge with 4.11.6

2013-03-11 21:17:57 +06:00

ControllerExtensions.cs

Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed.

2013-05-12 19:05:49 -10:00

ControllerFactoryExtensions.cs

Fixed Render route handler tests.

2013-02-20 06:30:06 +06:00

DefaultRenderMvcControllerResolver.cs

Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues.

2013-06-25 09:55:45 +10:00

FilteredControllerFactoriesResolver.cs

Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umbraco

2013-06-15 22:46:01 +02:00

HtmlTagWrapper.cs

…

HtmlTagWrapperTextNode.cs

…

IFilteredControllerFactory.cs

Fixes up pull request so that there is no breaking changes. We now type check for a new base class called

2013-02-19 07:30:46 +06:00

IHtmlTagWrapper.cs

…

IRenderMvcController.cs

Added events.Service and xmlhelper.service

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

MasterControllerFactory.cs

Fixed Render route handler tests.

2013-02-20 06:30:06 +06:00

MemberAuthorizeAttribute.cs

Implements real FormsAuthentication for back office cookie authentication... finally :)

2013-07-31 17:08:56 +10:00

MergeModelStateToChildActionAttribute.cs

…

NotChildAction.cs

Fixes: #U4-1819

2013-03-05 05:56:53 +06:00

PluginController.cs

Implemented UmbracoApiController as a plugin and is auto routed

2013-02-26 03:45:39 +06:00

PluginControllerArea.cs

Fixes: #U4-2343 for api controllers, already fixed for surface controllers

2013-06-18 15:46:36 +10:00

PluginControllerAttribute.cs

…

PluginControllerMetadata.cs

Implemented UmbracoApiController as a plugin and is auto routed

2013-02-26 03:45:39 +06:00

PluginViewEngine.cs

…

PostedDataProxyInfo.cs

…

QueryStringFilterAttribute.cs

publicized some ObjectExtensions, added Umbraco.Belle to internals, updated the names in which plugin routes are created,

2013-04-30 16:43:59 -10:00

RedirectToUmbracoPageResult.cs

Web.PublishedCache - introduce contextual caches

2013-03-19 17:51:55 -01:00

RenderActionInvoker.cs

Implements: #U4-2342 - IRenderMvcController

2013-06-25 09:33:48 +10:00

RenderControllerFactory.cs

Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues.

2013-06-25 09:55:45 +10:00

RenderModelBinder.cs

…

RenderMvcController.cs

Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues.

2013-06-25 09:55:45 +10:00

RenderRouteHandler.cs

Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues.

2013-06-25 09:55:45 +10:00

RenderViewEngine.cs

…

RouteDefinition.cs

Fixed issue: #U4-1726

2013-02-16 16:00:28 -01:00

RouteValueDictionaryExtensions.cs

…

Strings.Designer.cs

Upgrades required projects to .Net 4.5

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

Strings.resx

…

SurfaceController.cs

Merge with 4.11.9

2013-05-29 03:47:26 -02:00

SurfaceControllerFactory.cs

Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues.

2013-06-25 09:55:45 +10:00

SurfaceControllerResolver.cs

Fixes: #U4-1695

2013-02-19 02:25:57 +06:00

SurfaceRouteHandler.cs

Fixes up pull request so that there is no breaking changes. We now type check for a new base class called

2013-02-19 07:30:46 +06:00

UmbracoAuthorizeAttribute.cs

Fixes merge issues

2013-07-31 19:14:02 +10:00

UmbracoAuthorizedController.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

UmbracoController.cs

Implements real FormsAuthentication for back office cookie authentication... finally :)

2013-07-31 17:08:56 +10:00

UmbracoControllerFactory.cs

U4-2596: UmbracoControllerFactory method ReleaseController should be virtual

2013-08-07 15:06:41 +02:00

UmbracoMvcHandler.cs

Fixes: #U4-2460 - UmbracoHelper.RenderTemplate will now execute the complete MVC cycle when rendering MVC templates whereas before it would only execute the view which means any actionfilters, etc... applied would never have fired (as well as other things)

2013-07-05 14:12:31 +10:00

UmbracoPageResult.cs

Fixes: U4-1339 SurfaceController returning PartialView - cannot use ModelState ?

2013-08-29 14:51:30 +10:00

UmbracoTemplatePage.cs

Moved WriteLiteral method to UmbracoViewPage

2013-08-16 00:01:31 +02:00

UmbracoViewPage.cs

Fixes merge issue

2013-08-19 11:47:53 +02:00

ViewContextExtensions.cs

…

ViewDataContainerExtensions.cs

…

web.config.template

…