Shannon 64cbeb4c9d Merge branch 'dev-v7' into 7.3.0 ...

Conflicts:
	src/Umbraco.Core/Services/EntityService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
	src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
	src/umbraco.cms/businesslogic/template/Template.cs

2015-05-13 12:20:43 +10:00

..

BaseRest

merge

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

Dashboard

merge

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

InfrastructureSettings

Fix weird merge issues

2013-01-31 14:35:18 -01:00

UmbracoSettings

Merge branch 'dev-v7' into 7.3.0

2015-05-13 12:20:43 +10:00

CaseInsensitiveEnumConfigConverter.cs

Core. and Web.Configuration - go public

2013-03-01 13:56:12 -01:00

ClientDependencyConfiguration.cs

Updated all repo's to have their correct ctor's with their correct dependencies. Updated them all to accept ILogger updated all other dependencies with the same without breaking anything since all is internal, or obsoleted other public methods. Updates lots of the tests with mock instances instead, now more tests have less singleton dependencies, easier to test, much clearer and more IoC driven. Updated unit tests to supply the ILogger for required objects, tests should run faster now since most things are just mocked.

2015-01-09 10:51:15 +11:00

CommaDelimitedConfigurationElement.cs

merge

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

FileSystemProviderElement.cs

…

FileSystemProviderElementCollection.cs

…

FileSystemProvidersSection.cs

Renamed config interfaces properly with Section suffix, re-implemented the For<T> UmbracoConfiguration method to retreive specific settings... might use this entirely instead of the nested access as it might make it easier to mock.

2013-09-16 17:39:45 +10:00

GlobalSettings.cs

publicizes a global setting (which still needs to be moved to config)

2015-04-13 13:33:13 +10:00

InnerTextConfigurationElement.cs

Fixes: U4-6588 UmbracoSettings Error404 support Guids and Xpath - To achieve this, had to create an Id -> Key and Key -> Id method on EntityService including a cache for it which means updating all relavent cache refreshers to clear this cache when things are removed. Moved the logic for parsing an Umbraco XPath query (with tokens) to a stand-alone testable class (though haven't written tests), move the logic for looking up a not found page to the NotFoundHandlerHelper (instead of legacy 'library'). Fixes the $root query, since I don't think that ever worked. I've tested $root now for both MNTP and for the not found handler and it works.

2015-05-12 12:39:46 +10:00

OptionalCommaDelimitedConfigurationElement.cs

merge

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

OptionalInnerTextConfigurationElement.cs

merge

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

RawXmlConfigurationElement.cs

merge

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

RazorDataTypeModelStaticMappingItem.cs

Makes some massive headway with the real config section, have got all code re-delegated to using it and have migrated the baserest config to the core project, all configs will be shared out of the UmbracoConfiguration singleton, now to get the unit tests all wired up and using mocks for the most part.

2013-09-13 18:11:20 +10:00

UmbracoConfig.cs

publicizes a couple things to make it easier for tests

2015-04-15 17:06:08 +10:00

UmbracoConfigurationSection.cs

Renamed config interfaces properly with Section suffix, re-implemented the For<T> UmbracoConfiguration method to retreive specific settings... might use this entirely instead of the nested access as it might make it easier to mock.

2013-09-16 17:39:45 +10:00

UmbracoVersion.cs

Merge branch 'dev-v7' into 7.3.0

2015-05-07 16:24:29 +10:00