Shannon 3fbf90e56d Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 ...

Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

2015-06-03 15:08:47 +02:00

..

Actions

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

businesslogic

Merge remote-tracking branch 'origin/dev-v7' into 7.3.0

2015-06-03 15:08:47 +02:00

helpers

Fixes: U4-5380 Booting.aspx security issue

2014-08-25 14:31:04 +02:00

Properties

…

app.config

Fixes MVC references and updates to 4.0.0.1

2015-05-11 12:43:45 +10:00

packages.config

Updates CDF dependency to latest version

2015-03-19 12:54:00 +01:00

PluginManagerExtensions.cs

Changes the web.config template to use a linked resources (one file)

2013-11-26 20:03:13 +11:00

umbraco.cms.csproj

Merge branch 'dev-v7' into 7.3.0

2015-05-05 12:27:01 +10:00