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

..

StronglyTypedModels

merge

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

DynamicDocumentTestsBase.cs

changes TinyMCEv3Alias to just TinyMCEAlias but unfortunatey we cannot change the actual alias stored in the db because we're already in RC - that means that people will forever see TinyMCEv3 as the property editor alias :( even though it is already v4

2013-11-14 13:39:03 +11:00

DynamicNodeTests.cs

Fix unit tests that failed because UmbracoSettings.config was being cleaned up

2013-08-23 16:22:26 +02:00

DynamicPublishedContentCustomExtensionMethods.cs

renamed namespace in test proj

2012-11-15 02:04:46 +05:00

DynamicPublishedContentTests.cs

Fix unit tests that failed because UmbracoSettings.config was being cleaned up

2013-08-23 16:22:26 +02:00

DynamicXmlConverterTests.cs

Added moq (need to replace all rhino mock later) allowing us to nicely mock umbraco settings, fixing up more unit tests.

2013-09-17 00:14:15 +10:00

DynamicXmlTests.cs

Couple more changes to DynamicXml

2013-02-06 03:58:53 +06:00

LegacyExamineBackedMediaTests.cs

Added moq (need to replace all rhino mock later) allowing us to nicely mock umbraco settings, fixing up more unit tests.

2013-09-17 00:14:15 +10:00

PublishedContentDataTableTests.cs

PublishedContent - revert to using property.Value vs .ObjectValue

2013-09-25 12:54:24 +02:00

PublishedContentExtensionTests.cs

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

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

PublishedContentMoreTests.cs

merge

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

PublishedContentTestBase.cs

changes TinyMCEv3Alias to just TinyMCEAlias but unfortunatey we cannot change the actual alias stored in the db because we're already in RC - that means that people will forever see TinyMCEv3 as the property editor alias :( even though it is already v4

2013-11-14 13:39:03 +11:00

PublishedContentTestElements.cs

merge

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

PublishedContentTests.cs

changes TinyMCEv3Alias to just TinyMCEAlias but unfortunatey we cannot change the actual alias stored in the db because we're already in RC - that means that people will forever see TinyMCEv3 as the property editor alias :( even though it is already v4

2013-11-14 13:39:03 +11:00

PublishedMediaTests.cs

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

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