Shannon 930b61a7ff Merge branch 'dev-v7' into dev-v7-contenttypeeditor ...

Conflicts:
	src/Umbraco.Web.UI.Client/src/less/belle.less

2015-08-13 11:09:04 +02:00

..

App_Browsers

…

App_Start

working on: U4-6756 Don't ship or generate unnecessary folders

2015-07-16 15:29:46 +02:00

config

Merge branch 'dev-v7' into dev-v7-contenttypeeditor

2015-08-13 11:09:04 +02:00

Properties

Updates to latest AutoMapper and HtmlAgility

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

umbraco

Update to MVC5

2015-07-30 17:08:39 +02:00

Umbraco

Merge branch 'dev-v7' into dev-v7-contenttypeeditor

2015-06-23 18:27:18 +02:00

umbraco_client

Fixes: U4-6771 Sorting editorstyles is not possible

2015-07-23 14:27:54 +02:00

Views

Update to MVC5

2015-07-30 17:08:39 +02: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

Updates to latest Examine

2015-08-10 18:06:23 +02:00

Umbraco.Web.UI.csproj

Updates to latest Examine

2015-08-10 18:06:23 +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

Update to MVC5

2015-07-30 17:08:39 +02:00

web.Template.Debug.config

Fix web.config and adds a transform for NuGet

2015-07-30 17:08:40 +02:00

web.Template.Release.config

Made the whitespace consistent in config files.

2014-03-28 16:25:01 +00:00