Shannon f9159a0afc Merge remote-tracking branch 'origin/7.3.0' into dev-v8 ...

Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/DataTypesResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/CodeFirst/Definitions/ContentTypeDefinitionFactory.cs
	src/Umbraco.Tests/CodeFirst/TypeInheritanceTest.cs
	src/Umbraco.Tests/Macros/MacroTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseSeleniumTest.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
	src/umbraco.cms/businesslogic/CMSNode.cs
	src/umbraco.cms/businesslogic/propertytype/propertytype.cs
	src/umbraco.cms/businesslogic/web/StyleSheet.cs
	src/umbraco.editorControls/tinyMCE3/TinyMCE.cs

2015-01-19 13:16:56 +11:00

..

MacroFieldEditorsResolver.cs

Decoupling more things, mostly to do with the PluginManager and logging which now requires an IServiceProvider so have created a simple instance of that.

2015-01-16 15:47:44 +11:00

MacroTagParser.cs

Fixes: U4-4084 Macro's with non alphanumeric chars in their aliases cannot render in the rich text editor

2014-01-20 13:59:25 +11:00

PartialViewMacroResult.cs

working on U4-5648 Remove legacy razor macro's entirely - removes lots of legacy

2014-11-14 17:15:38 +11:00

PersistableMacroProperty.cs

Created MacroTagParser and updated ItemRenderer to use it. Have DynamicDocument rendering RTE content

2012-09-08 07:13:03 +07:00

XsltExtension.cs

delete fontawesome

2013-09-02 15:40:14 +02:00

XsltExtensionAttribute.cs

Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/

2013-09-04 13:18:23 +10:00

XsltExtensionsResolver.cs

Decoupling more things, mostly to do with the PluginManager and logging which now requires an IServiceProvider so have created a simple instance of that.

2015-01-16 15:47:44 +11:00