Shannon 3ef204a46f Merge remote-tracking branch 'origin/dev-v7' into dev-v8 ...

Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Core/Persistence/UmbracoDatabase.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs

2016-04-20 15:53:13 +02:00

..

App_Browsers

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

App_Plugins/ModelsBuilder

Upgrade ModelsBuilder to 3.0.1

2016-03-14 13:37:49 +01:00

config

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

2016-04-13 16:18:58 +02:00

Properties

U4-5424 Upgrade to latest .Net framework version (4.6.1)

2015-12-21 19:23:13 +01:00

umbraco

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

2016-04-20 15:53:13 +02:00

Umbraco

Merge branch 'U4-8189' of https://github.com/danlister/Umbraco-CMS into danlister-U4-8189

2016-03-31 19:40:07 +02:00

umbraco_client

removes legacy disable user menu item and uses the new/normal way of dealing with menu items.

2016-03-31 19:41:42 +02:00

Views

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

2016-01-15 17:05:09 +01:00

default.aspx

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

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/dev-v7' into dev-v8

2016-03-23 11:04:06 +01:00

Umbraco.Web.UI.csproj

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

2016-04-12 15:16:19 +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

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

2016-04-13 16:18:58 +02:00

web.Template.Debug.config

fixes some ysods

2016-03-31 14:28:41 +02:00

web.Template.Release.config

Another build warning that can be removed

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