Shannon 0f503fc320 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 ...

Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.resx
	src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.cms/businesslogic/workflow/Notification.cs
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj

2014-01-13 14:08:23 +11:00

..

App_Browsers

…

config

Removes the version specific info from the CDF and Examine references in all proj files.

2014-01-13 14:02:50 +11:00

install

Merge branch 'kipusoep-patch-1' into 6.2.0

2013-12-19 11:49:30 +11:00

MacroScripts

merge

2013-11-07 17:16:22 +01:00

Properties

merge

2013-11-07 17:16:22 +01:00

umbraco

Fixes: U4-3995 Remove Contour language keys from deployed language files

2014-01-10 00:43:53 +11:00

Umbraco

Fixes up the auth http post

2013-12-11 18:53:00 +11:00

umbraco_client

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2014-01-02 15:28:42 +11:00

Views

U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error

2013-11-19 15:12:47 +01:00

xslt

…

default.aspx

…

Global.asax

…

packages.config

Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task

2014-01-09 18:08:13 +11:00

Umbraco.Web.UI.csproj

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2014-01-13 14:08:23 +11:00

web.Template.config

Merge branch 'enkelmedia-patch-2' into 7.0.2

2013-12-29 12:41:12 +01:00

web.Template.Debug.config

Completes: U4-3792 Move appSettings, connectionStrings back to web.config

2013-12-06 11:52:47 +11:00

web.Template.Release.config

Moves appSettings to external file and updates the code that modifies the app settings.

2013-10-04 10:34:00 +10:00