Shannon 44732e5f52 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 ...

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

2017-01-17 18:21:45 +11:00

..

Actions

Fix backoffice breaking when Actions use code in their JsSource - U4-6843

2015-07-15 16:59:09 -06:00

businesslogic

Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6

2017-01-17 18:21:45 +11:00

helpers

removes erroneous reverse call

2016-01-06 12:00:50 +01:00

Properties

Fixes the requirement for LegacyUploadFieldWorkaround, cleans up some of the code in ContentControl and various other (legacy) places, improves performance slightly too.

2013-01-07 23:24:29 +03:00

app.config

Update to MVC5

2015-07-30 17:08:39 +02:00

packages.config

updates cdf version

2016-11-18 14:34:31 +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

Fixes IP nuget references and fixes up several other Nuget assembly references.

2017-01-03 10:36:26 +11:00

umbraco.cms.csproj.DotSettings

Makes sure that R# doesn't suggest C#6 features

2015-07-24 17:25:52 +02:00