Shannon cb539e82d0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 ...

# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
#	src/UmbracoExamine/UmbracoMemberIndexer.cs

2017-03-29 18:11:51 +11:00

..

App_Browsers

…

App_Plugins/ModelsBuilder

move dashboard from App_Plugins to dashboards folder

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

config

Fixes release version of tinymceconfig

2017-03-22 18:32:28 +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

deploy-257 Downgrade Core and Deploy to framework 4.5

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

umbraco

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

2017-03-29 18:11:51 +11:00

Umbraco

U4-9192 Add jQuery migrate for user controls used in tabs that will improve backwards compatibility

2016-11-17 14:24:46 +00: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

WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility.

2014-12-11 15:58:54 +11:00

packages.config

U4-9004 Remove URLRewriting.net dependency

2017-03-09 11:41:36 +01:00

Umbraco.Web.UI.csproj

bumps version

2017-03-29 16:35:37 +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-9655 - update HtmlAgilityPack version in config

2017-03-24 14:47:27 +01:00

web.Template.Debug.config

U4-9655 - update HtmlAgilityPack version in config

2017-03-24 14:47:27 +01:00

web.Template.Release.config

U4-6566 Membership provider useLegacyEncoding should default to false

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