Shannon 2b25815eee Merge branch '7.2.0' into 7.3.0 ...

Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj

2014-12-01 12:22:19 +11:00

..

Actions

U4-4931 - lock contention & potential application lockdown

2014-07-10 10:34:17 +02:00

businesslogic

WIP working on getting the template services up to par and wrapping the new ones from old ones.

2014-11-25 18:48:19 +11:00

helpers

Fixes: U4-5380 Booting.aspx security issue

2014-08-25 14:31:04 +02: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

Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.

2014-11-26 10:43:46 +01:00

packages.config

Updating json.net dependency to 6.0.4

2014-08-20 10:44:05 +02: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

Updating json.net dependency to 6.0.4

2014-08-20 10:44:05 +02:00