Shannon cd3191012f Merge branch 'dev-v7' into 7.3.0 ...

Conflicts:
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs

2015-03-27 15:15:49 +11: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-03-27 15:15:49 +11: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

Added FileSystemProviders config section

2012-08-13 13:26:06 -01:00

FileSystemProviderElementCollection.cs

Added FileSystemProviders config section

2012-08-13 13:26:06 -01:00

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

Fixes merge issues

2014-03-18 19:05:07 +11:00

InnerTextConfigurationElement.cs

merge

2013-11-07 17:16:22 +01: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

fixes the config issue with unit tests

2014-03-19 17:56:30 +11: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

Completes: U4-5846 Remove cmsTemplate.master column and transfer those values over to umbracoNode.parentId, U4-5847 Ensure the path is set correctly for templates in the db, almost done the other template service tasks too.

2014-12-05 17:29:47 +11:00