Shannon e04eed41e7 Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 ...

Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PreValueCollection.cs
	src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs

2014-05-22 13:01:23 +10:00

..

BaseRest

Clarified /base obsoletion to point out UmbracoApiController

2014-05-08 11:14:00 +02:00

Cache

Merge remote-tracking branch 'origin/6.2.1' into 7.1.3

2014-05-13 10:46:14 +10:00

Controllers

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

2014-04-23 12:00:32 +10:00

Dictionary

…

Dynamics

…

Editors

Undoes the comma encoding for tags and istead adds support to store the tags as json or csv (U4-4741)

2014-05-15 12:49:03 +10:00

Install

Fixes: U4-4714 Sql Azure no longer a database option in 7.1

2014-04-17 19:55:17 +10:00

Macros

…

Media

…

Models

Fix the build

2014-05-18 21:27:41 +02:00

Mvc

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

2014-04-22 13:05:30 +10:00

Properties

…

PropertyEditors

Undoes the comma encoding for tags and istead adds support to store the tags as json or csv (U4-4741)

2014-05-15 12:49:03 +10:00

PublishedCache

Fix the build

2014-05-18 21:41:34 +02:00

Routing

U4-4949 - fix issue with domains

2014-05-20 09:32:26 +02:00

Search

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

2014-05-05 12:49:06 +10:00

Security

oops fixed build

2014-05-08 19:03:40 +10:00

Standalone

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

2014-03-06 20:22:32 +11:00

Strategies

Fixes: U4-4573 7.0.4 Save and Send For Approval button not sending notification email

2014-05-08 00:45:54 +10:00

Templates

…

Trees

U4-4073 Audit Trail is missing from action menu

2014-03-24 09:34:47 +01:00

UI

Merge remote-tracking branch 'origin/6.2.1' into 7.1.4

2014-05-22 13:01:23 +10:00

umbraco.presentation

Merge remote-tracking branch 'origin/6.2.1' into 7.1.4

2014-05-22 13:01:23 +10:00

Web References

Fixes: U4-4619 Make sure installer pings stats

2014-04-07 16:08:34 +02:00

WebApi

Fixes: U4-4546 Error: Failed to retreive data for media ids

2014-05-09 15:50:07 +10:00

WebServices

Merge remote-tracking branch 'origin/6.2.1' into 7.1.4

2014-05-22 13:01:23 +10:00

app.config

Upgrade to Json.Net 6.0.2

2014-04-08 11:37:40 +02: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

…

ContextualPublishedCacheExtensions.cs

…

ExamineExtensions.cs

…

FormDataCollectionExtensions.cs

…

FormlessPage.cs

…

HtmlHelperRenderExtensions.cs

…

HttpCookieExtensions.cs

…

HttpRequestExtensions.cs

…

HttpUrlHelperExtensions.cs

…

ImageCropperBaseExtensions.cs

Creating the internal GetBaseCropUrl method and moving the logic from the Model GetCropUrl method to ImageCropperBaseExtensions so that it can be used by both the Model method and the template extensions

2014-04-21 08:38:53 +01:00

ImageCropperTemplateExtensions.cs

Fixes U4-4767 and adds a Test for it

2014-04-27 22:06:48 +01:00

LegacyScheduledTasks.cs

…

MediaPropertyExtensions.cs

Cleans up a little bit of code and adds some null checks.

2014-03-19 15:32:31 +11:00

MembershipProviderExtensions.cs

…

ModelStateExtensions.cs

…

NotificationServiceExtensions.cs

Fixes: U4-4856 ApplicationContext.Current.Services.ContentService.Save throw exception

2014-05-12 14:32:34 +10:00

packages.config

Upgrade to Json.Net 6.0.2

2014-04-08 11:37:40 +02:00

PluginManagerExtensions.cs

…

PublishedContentExtensions.cs

Back to IPublishedContentProperty (for 6 only)

2014-04-30 16:53:14 +02:00

PublishedContentPropertyExtension.cs

Back to IPublishedContentProperty (for 6 only)

2014-04-30 16:53:14 +02:00

PublishedContentQuery.cs

…

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

Fixes: U4-4420 TagQuery / TagService missing method to get content with tag.

2014-05-07 14:27:10 +10:00

Umbraco.Web.csproj

Fixes: U4-4546 Error: Failed to retreive data for media ids

2014-05-09 15:50:07 +10:00

UmbracoApplication.cs

…

UmbracoContext.cs

Updated install steps, classes and logic

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

UmbracoContextExtensions.cs

…

UmbracoHelper.cs

Detached PublishedProperty - refactor

2014-05-18 19:06:28 +02:00

UmbracoModule.cs

Removing 503 header as Azure Websites would just stop doing anything after seeing this, so

2014-03-11 17:28:55 +01:00

UmbracoUserControl.cs

…

UriUtility.cs

…

UrlHelperExtensions.cs

Fixes up the GetUrlWithTimeStamp to be called GetUrlWithCacheBust and another extension method to actually generate the hash which will be umb version + cdf version hashed or datetime.ticks if in debug mode. Updates the main view to use CDF to render the CSS which ensures compression/minification/combination + cache busting.

2014-03-07 11:03:13 +11:00

UrlHelperRenderExtensions.cs

…

WebBootManager.cs

Fixes: sites cannot run the new installer if they have /install directory

2014-03-07 12:10:04 +01:00

WebViewPageExtensions.cs

…