Shannon 3e76623887 Merge branch '7.1.5' into 7.1.3-variations ...

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj

2014-06-09 14:36:07 +02:00

..

ContentEditing

Ensures unique naming is ignoring variants, adds small UI bit to show that the current item is a variant.

2014-05-29 12:49:45 +10:00

Mapping

Gets variant names updated when a master doc changes it's name, this includes handling the invalidation of cache for the master + all variants and now my brain hurts but it is working.

2014-05-29 18:15:18 +10:00

Segments

Removes UI for adding a segment value for a configured segment since it doesn't make sense, a configurable segment is always just a boolean match.

2014-06-04 20:32:51 +10:00

Trees

Ensure refresh node action is translated

2013-11-28 15:35:23 +01:00

ChangingPasswordModel.cs

merge

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

DetachedContent.cs

Fix the build

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

DynamicPublishedContent.cs

Implement content.FirstChild

2014-06-09 13:04:40 +02:00

DynamicPublishedContentList.cs

Take care of more FIXMEs

2013-09-18 10:09:05 +02:00

ImageCropAnchor.cs

Moves the image crop enums to their correct location and renames them to be more descriptive (less generic).

2014-03-20 14:27:58 +11:00

ImageCropCoordinates.cs

Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property).

2014-03-20 14:57:48 +11:00

ImageCropData.cs

Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property).

2014-03-20 14:57:48 +11:00

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

ImageCropFocalPoint.cs

Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property).

2014-03-20 14:57:48 +11:00

ImageCropMode.cs

Update ImageCropMode.cs

2014-04-28 10:17:41 -05:00

ImageCropRatioMode.cs

Adding Ratio Mode parameter to GetCropUrl helper

2014-04-18 22:04:23 +01:00

IRenderModel.cs

merge

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

LoginModel.cs

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

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

LoginStatusModel.cs

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

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

PartialViewMacroModel.cs

Merge with 4.11.6

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

PartialViewMacroModelExtensions.cs

Adding extension methods to PartialViewMacroModel to allow: Model.GetParameterValue<DateTime>("datey")

2014-05-14 11:33:40 +01:00

PasswordChangedModel.cs

merge

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

PostRedirectModel.cs

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

ProfileModel.cs

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

2014-03-13 14:12:45 +11:00

PublishedContentBase.cs

Fixes the Url property to work with the image cropper to be consistent with the upload field.

2014-03-20 14:58:18 +11:00

PublishedProperty.cs

Detached PublishedProperty

2014-04-19 18:39:11 +02:00

RegisterModel.cs

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

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

RenderModel.cs

Web.Mvc - Refactor UmbracoViewPage, UmbracoTemplatePage, support strongly-typed content

2013-10-25 13:21:29 +02:00

RenderModelOfTContent.cs

merge

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

TagModel.cs

merge

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

UmbracoProperty.cs

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

2014-03-13 14:12:45 +11:00

UpgradeCheckResponse.cs

merge

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