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

Merge branch '7.0.0' into 7.0.0-pubcontent

2013-09-26 08:57:01 +02:00

Editors

Fixes merge issues

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

Install

merge

2014-03-05 20:12:45 +01: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

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

2013-10-03 18:17:35 +02:00

Models

Implements IHtmlString on imagecropdataset

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

Mvc

Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas.

2014-03-05 22:42:51 +11:00

Properties

Moves the our umbraco web reference to where it needs to be.

2013-11-01 09:21:29 +11:00

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

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-30 14:12:36 +02:00

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

merge

2013-11-07 17:16:22 +01:00

WebApi

Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas.

2014-03-05 22:42:51 +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

…

AreaRegistrationContextExtensions.cs

Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas.

2014-03-05 22:42:51 +11:00

CacheHelperExtensions.cs

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

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

ContextualPublishedCacheExtensions.cs

PublishedContent - the big refactoring

2013-09-16 17:17:45 +02:00

ExamineExtensions.cs

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-23 21:57:22 +02:00

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

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

2013-12-04 13:50:55 +11:00

HttpUrlHelperExtensions.cs

Fixes member data indexing to ensure it includes the unique key, fixes the EntityService search to return IEnumerable<EntityBasic>, not search results so the data returned is limited to non-sensitive data, adds AdditionalData to EntityBasic so we can add additional values like URL to outgoing entities, Fixes up the searchService, searchControllers to use new structure.

2013-10-29 11:39:34 +11:00

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

Removes unpublish context menu option since it's not currently implemented, cleans up some code.

2013-11-05 09:38:54 +11:00

MediaPropertyExtensions.cs

Cropsizes config and upload compatible

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

MembershipProviderExtensions.cs

merge

2013-11-07 17:16:22 +01:00

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

Gets view paths to load in dynamically based on whether a core or plugin tree is rendering, this allows us to store view files based on conventions for packages. Completes: U4-2849 Ensure editor views, etc... can exist outside of the /umbraco folder for package devs

2013-10-03 11:25:26 +10:00

PublishedContentExtensions.cs

U4-4241 - UrlAbsolute() returns relative urls

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

PublishedContentPropertyExtension.cs

merge

2013-11-07 17:16:22 +01:00

PublishedContentQuery.cs

merge

2013-11-07 17:16:22 +01:00

RenderFieldCaseType.cs

…

RenderFieldEncodingType.cs

…

RouteCollectionExtensions.cs

Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas.

2014-03-05 22:42:51 +11:00

TagQuery.cs

merge

2013-11-07 17:16:22 +01:00

Umbraco.Web.csproj

merge

2014-03-05 20:12:45 +01:00

UmbracoApplication.cs

…

UmbracoContext.cs

Updated install steps, classes and logic

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

UmbracoContextExtensions.cs

merge

2013-11-07 17:16:22 +01:00

UmbracoHelper.cs

Fixing: U4-3686 Umbraco 7 - Rich Text Editor and Macro Issues + fixed up the per-controller webapi configuration and more fixes to loading propertyeditors/param editors, this saves a assembly scan.

2013-12-06 15:01:58 +11:00

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

Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

2013-09-25 19:23:41 +10:00

UrlHelperExtensions.cs

Gets lots of the new installer logic working

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

UrlHelperRenderExtensions.cs

merge

2013-11-07 17:16:22 +01:00

WebBootManager.cs

Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas.

2014-03-05 22:42:51 +11:00

WebViewPageExtensions.cs

merge

2013-11-07 17:16:22 +01:00