Sebastiaan Janssen 3423d8b2cc Merge branch 'dev-v7' into temp-u4-10006 ...

# Conflicts:
#	.gitignore
#	build/Build.bat
#	build/Build.proj
#	build/BuildBelle.bat
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

2017-09-09 14:54:48 +02:00

..

App_Browsers

…

App_Plugins/ModelsBuilder

move dashboard from App_Plugins to dashboards folder

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

config

Updates from dev-v7

2017-08-07 15:29:34 +02: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

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

umbraco

Merge pull request #2075 from defsteph/U4-10197

2017-09-07 13:33:55 +01:00

Umbraco

Removed "remove paragraph tags" field

2017-07-03 13:44:37 +02:00

umbraco_client

U4-10367 417 missing token error due to cookie being overwritten

2017-08-29 11:17:52 +02:00

Views

Updates from dev-v7

2017-08-07 15:29:34 +02:00

default.aspx

…

Global.asax

…

packages.config

Updated Examine Nuget to latest version 1.8.3

2017-05-16 09:12:50 -07:00

Umbraco.Web.UI.csproj

VS loves managing whitespace.. go ahead then

2017-09-08 14:12:53 +02: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

Adds SQLCE assembly redirect on fresh installs and upgrades

2017-05-15 22:54:46 +02:00

web.Template.Debug.config

Reverts CodeAnalysis update to stay compatible with Models builder

2017-04-10 13:45:34 +02:00

web.Template.Release.config

U4-6566 Membership provider useLegacyEncoding should default to false

2017-03-14 17:05:24 +01:00