Sebastiaan Janssen 994ded8518 Merge remote-tracking branch 'origin/7.3.6' into dev-v7 ...

# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Web.UI/packages.config

2016-01-19 11:10:18 +01:00

..

App_Browsers

…

App_Plugins/ModelsBuilder

adds latest MB version

2016-01-15 17:06:22 +01:00

config

Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder

2016-01-15 15:24:39 +01:00

Properties

Updates to latest AutoMapper and HtmlAgility

2015-06-16 10:19:34 +02:00

umbraco

fixes capitalisation

2016-01-15 12:04:29 +01:00

Umbraco

Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder

2016-01-15 15:24:39 +01:00

umbraco_client

Fixes issue with Insert RenderSection

2016-01-14 15:37:24 +01:00

Views

Adds required namespace + a fake class to make sure the namespace exists

2016-01-15 17:05:09 +01: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

Merge remote-tracking branch 'origin/7.3.6' into dev-v7

2016-01-19 11:10:18 +01:00

Umbraco.Web.UI.csproj

Merge remote-tracking branch 'origin/7.3.6' into dev-v7

2016-01-19 11:10:18 +01: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

Reference to System.Runtime is required

2016-01-15 16:24:14 +01:00

web.Template.Debug.config

Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

2016-01-13 17:31:35 +01:00

web.Template.Release.config

Set min password length is 8 characters by default for release

2015-09-16 14:32:56 +02:00