Umbraco-CMS

Files

Shannon d5460068d4 Merge remote-tracking branch 'origin/master-v7' into dev-v7

Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Macros/MacroTagParser.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Controllers/BackOfficeControllerUnitTests.cs
	src/Umbraco.Tests/Macros/MacroParserTests.cs
	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/umbraco.cms/Actions/Action.cs

2015-07-16 17:04:25 +02:00

ApiDocs

Creates powershell file to do the build, this detects if you have sandcastle installed first, also overwrites the default TOC.css file with a custom slightly nicer version for the output.

2014-01-24 18:23:37 +11:00

NuSpecs

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

2015-07-16 17:04:25 +02:00

Build.bat

Experiment with less verbose logging for the build (so AppVeyor is easier to use)

2015-06-21 14:41:18 +02:00

Build.proj

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