Shannon 903ce09426 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.Web.UI/Umbraco.Web.UI.csproj

2016-12-29 13:57:55 +11:00

..

App_Browsers

…

App_Plugins/ModelsBuilder

move dashboard from App_Plugins to dashboards folder

2016-08-05 12:36:10 +02:00

config

Revert "Merge pull request #1618 from AliSheikhTaheri/U4-9180"

2016-12-20 12:28:45 +11:00

Media

U4-8472 Add web.config file to media folder path to prevent all execution based files from being run by IIS

2016-06-28 16:01:23 +02:00

Properties

…

umbraco

Merge origin/dev-v7 into dev-v7.6

2016-11-18 09:52:45 +01:00

Umbraco

Merge branch 'dev-v7-U4-8597' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-8597

2016-08-08 11:31:29 +02:00

umbraco_client

U4-9160 Headline in the "Republish entire site" dialog is not translated

2016-11-08 10:53:29 +01:00

Views

U4-9262 CleanForXss breaks rgba() values set as grid background color style

2016-12-20 13:27:53 +11:00

default.aspx

…

Global.asax

…

packages.config

updates cdf version

2016-11-18 14:34:31 +01:00

Umbraco.Web.UI.csproj

bumps version

2016-12-19 16:42:05 +11:00

Umbraco.Web.UI.csproj.DotSettings

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

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

web.Template.config

U4-9246 Should ship with numRecompilesBeforeAppRestart="50" to avoid max recompilations reached errors

2016-12-19 17:10:29 +11:00

web.Template.Debug.config

Make sure that everybody working on the source actually gets these assembly references in web.config

2016-02-11 17:11:02 +01:00

web.Template.Release.config

Another build warning that can be removed

2016-02-04 18:36:26 +01:00