Umbraco-CMS

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-20 13:40:17 +11:00

Updates the membership partial view templates to redirect to current page by default but allows this to be overridden. Creates a new RedirectToCurrentUmbracoUrl method which is slightly diff from RedirectToCurrentUmbracoPage since it doesn't care about the actual page item rendering, just the currently rendered URL which is useful if coming from a rewritten URL (which is what happens with public access rewrites)

2014-02-13 13:30:32 +11:00

Dictionary

…

Dynamics

…

Editors

Fixes merge issues

2014-02-21 16:43:49 +11:00

Install

Removes default instructions from the installer service, passing in empty instructions is ok now and the server will assign defaults if they are empty.

2014-03-05 12:08:35 +11:00

Macros

Fixes: U4-4223 MVC based forms with SurfaceControllers don't work when rendered in Webforms mode.

2014-02-13 13:19:51 +11:00

Media

…

Models

Implements IHtmlString on imagecropdataset

2014-02-24 10:42:29 +01:00

Mvc

Creates Install MVC Area, creates new installer api controllers, moves old installer files to the new Area folder so that the /install path can route properly.

2014-02-26 04:15:14 +11:00

Properties

…

PropertyEditors

Cropsizes config and upload compatible

2014-02-20 12:59:15 +01:00

PublishedCache

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

Routing

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0-installer

2014-03-03 04:17:40 +01:00

Search

Cleans up some more of the old 'object' User Id references.

2014-02-17 15:26:38 +11:00

Security

Fixes new membership providers to ensure no sql is run on init. Fixes the installer useLegacyEncoding setup to not attempt to set this when the legacy provider is enabled.

2014-02-26 02:57:05 +11:00

Standalone

Backporting the cachehelper and associated cache classes.

2013-12-16 13:19:10 +11:00

Strategies

Fixes sql statement - to be like we have in v7 that supports all sql servers

2014-02-25 02:37:48 +11:00

Templates

…

Trees

Enables change content type action for v7 as well (see issue 1468)

2014-02-19 21:48:17 +01:00

UI

Updates yepnope cache in jsinit.cs to append correct rnd value

2014-02-19 00:19:16 +01:00

umbraco.presentation

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-21 16:32:53 +11:00

Web References

…

WebApi

Fixes merge issues

2014-02-13 16:46:52 +11:00

WebServices

U4-2317 - issue with domains & languages management

2014-01-30 16:19:09 +01:00

app.config

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-21 16:32:53 +11:00

ApplicationContextExtensions.cs

…

CacheHelperExtensions.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2013-12-19 12:53:32 +11:00

ContextualPublishedCacheExtensions.cs

…

ExamineExtensions.cs

…

FormDataCollectionExtensions.cs

…

FormlessPage.cs

…

HtmlHelperRenderExtensions.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

HttpCookieExtensions.cs

Fixes: U4-3907 Token cookie issues in 7.0.1

2013-12-24 10:48:32 +11:00

HttpRequestExtensions.cs

…

HttpUrlHelperExtensions.cs

…

ImageCropperBaseExtensions.cs

Fixing totally broken merge

2014-02-20 12:59:11 +01:00

ImageCropperTemplateExtensions.cs

Replace Crop() with GetCropUrl()

2014-02-24 15:35:24 +01:00

LegacyScheduledTasks.cs

…

MediaPropertyExtensions.cs

Cropsizes config and upload compatible

2014-02-20 12:59:15 +01:00

MembershipProviderExtensions.cs

…

ModelStateExtensions.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

NotificationServiceExtensions.cs

Fixes: U4-3830 Unable to get email notifications working in version 7

2014-01-13 16:13:53 +11:00

packages.config

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-21 16:32:53 +11:00

PluginManagerExtensions.cs

…

PublishedContentExtensions.cs

U4-4241 - UrlAbsolute() returns relative urls

2014-02-17 10:49:26 +01:00

PublishedContentPropertyExtension.cs

…

PublishedContentQuery.cs

…

RenderFieldCaseType.cs

…

RenderFieldEncodingType.cs

…

RouteCollectionExtensions.cs

…

TagQuery.cs

…

Umbraco.Web.csproj

Updates to include returning the next step in sequence

2014-03-05 10:32:59 +11:00

UmbracoApplication.cs

…

UmbracoContext.cs

Updated install steps, classes and logic

2014-03-04 11:16:42 +11:00

UmbracoContextExtensions.cs

…

UmbracoHelper.cs

…

UmbracoModule.cs

Creates Install MVC Area, creates new installer api controllers, moves old installer files to the new Area folder so that the /install path can route properly.

2014-02-26 04:15:14 +11:00

UmbracoUserControl.cs

…

UriUtility.cs

…

UrlHelperExtensions.cs

Gets lots of the new installer logic working

2014-02-26 16:01:31 +01:00

UrlHelperRenderExtensions.cs

…

WebBootManager.cs

Creates Install MVC Area, creates new installer api controllers, moves old installer files to the new Area folder so that the /install path can route properly.

2014-02-26 04:15:14 +11:00

WebViewPageExtensions.cs

…