Umbraco-CMS

Files

Shannon d3eff734aa Merge branch 'dev-v7' into 7.3.0

Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj

2015-03-19 17:37:00 +11:00

Controllers

Merge branch 'dev-v7' into 7.3.0

2015-03-19 17:37:00 +11:00

InstallSteps

decouples more of LogHelper and DisposableTimer

2015-01-16 12:29:27 +11:00

Models

Adds newsletter to installer

2014-04-02 11:20:35 +02:00

DatabaseHelper.cs

Fixes up the dbconnection checker to work with all supported db types.