Umbraco-CMS

Files

Shannon 0a7bbfb1ca Merge remote-tracking branch 'origin/6.2.5' into 7.2.1

Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/install/steps/defaultUser.ascx
	src/Umbraco.Web.UI/web.Template.Debug.config
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/IBackgroundTask.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Scheduling/TaskEventArgs.cs
	src/Umbraco.Web/Umbraco.Web.csproj

2014-12-08 17:16:16 +11:00

BackgroundTaskRunner.cs

Ports v7 changes for U4-5728 - OriginalRequestUrl not initialized, KeepAlive or ScheduledPublishing run too soon

2014-12-07 16:16:29 +01:00

IBackgroundTask.cs

Ports v7 changes for U4-5728 - OriginalRequestUrl not initialized, KeepAlive or ScheduledPublishing run too soon

2014-12-07 16:16:29 +01:00

KeepAlive.cs

Merge remote-tracking branch 'origin/6.2.5' into 7.2.1

2014-12-08 17:16:16 +11:00

LogScrubber.cs

Merge remote-tracking branch 'origin/6.2.5' into 7.2.1