Shannon d5e0c6ff68 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 ...

Conflicts:
	.gitignore
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.designer.cs
	src/Umbraco.Web.UI/umbraco/editContent.aspx
	src/Umbraco.Web.UI/umbraco/login.aspx
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
	src/Umbraco.Web.UI/umbraco/umbraco.aspx

2013-12-19 15:08:19 +11:00

..

Bundles

Completes: U4-1521 Updated back office to use ClientDependency bundles for common files

2013-12-19 15:05:05 +11:00

Controls

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

2013-12-19 15:08:19 +11:00

JavaScript

Completes: U4-3712 Allow c# property editors to have custom js injected into the js initialization block so they can load in angular controllers

2013-11-28 14:27:58 +11:00

Pages

adds umbraco session id to UserData so we can use for csrf

2013-11-29 12:42:50 +11:00

CdfLogger.cs

Updated to latest CDF version that has a few bug fixes and added a CDF logger.

2013-05-28 13:24:48 -10:00

IAssignedApp.cs

Secures all ITasks, adds unit tests to ensure they are all secured and the correct app is assigned.

2013-04-08 23:11:47 +06:00

LegacyDialogHandler.cs

Fixes: U4-2852 Create dialog with legacy implementations.

2013-11-01 14:46:33 +11:00

LegacyDialogTask.cs

Fixing unit tests

2013-11-04 17:24:25 +11:00

SpeechBubbleIcon.cs

Gets notification msgs on the server side to be displayed. Fixes property existence checking... was checking on id before but that is incorrect, needs to be on alias since a new property id is gen'd on each save and we're not re-wiring them back up. Fixes YSOD messaging for content as well. Changes the ModelState to modelState to be consistent in js.

2013-07-22 18:16:50 +10:00