Shannon
d2dbd91b17
Fixes merge issues
2014-12-08 17:19:48 +11:00
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
Shannon
864994a56e
updates error msgs when sending requests to the same server pointing to docs on baseUrl
2014-12-08 17:04:22 +11:00
Shannon
3405c5001b
working on U4-5964, U4-5907, U4-5965
2014-12-08 15:18:32 +11:00
Sebastiaan Janssen
4eb9a54fa5
Ports v7 changes for U4-5728 - OriginalRequestUrl not initialized, KeepAlive or ScheduledPublishing run too soon
...
#U4-5728
2014-12-07 16:16:29 +01:00
Shannon
6df6e3bdad
Fixes: U4-3737 macro container make sure you can define the allowed macros + the max number
2014-11-13 17:44:03 +11:00
Shannon
9019c49ee8
Merge branch '7.1.9' into 7.2.0
...
Conflicts:
build/NuSpecs/UmbracoCms.Core.nuspec
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
src/Umbraco.Tests/Plugins/PluginManagerTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Scheduling/KeepAlive.cs
src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
src/UmbracoExamine/BaseUmbracoIndexer.cs
src/UmbracoExamine/DataServices/UmbracoContentService.cs
src/UmbracoExamine/DataServices/UmbracoMediaService.cs
src/UmbracoExamine/UmbracoContentIndexer.cs
src/UmbracoExamine/UmbracoMemberIndexer.cs
2014-11-13 16:32:50 +11:00
Shannon
4ec37b9d3a
Fixes: U4-5391 Create config to explicitly set the 'base url' for a website that is not running as a load balanced site - used for scheduled tasks/publishing/keepalive
2014-11-13 13:05:27 +11:00
Shannon
b1d4a99510
U4-5728 - Do not run KeepAlive, ScheduledPublishing, without an url
...
Updates the scheduler and the scheduled tasks to use a background task runner (ported from new courier codebase with tests) so that they are web aware and wind down properly.
2014-11-12 16:00:17 +11:00
Stephan
0f4436a465
U4-5728 - Do not run KeepAlive, ScheduledPublishing, without an url
2014-11-03 20:20:10 +01:00
Shannon
38c4bc72cd
Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
2014-06-25 12:03:53 +10:00
Shannon
7cf7ac687c
last issue with state/keep alive timer
2014-06-25 12:03:31 +10:00
Shannon
6b626baffb
Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
2014-06-25 11:56:56 +10:00
Shannon
7ce0272169
updates state param with timers to use singleton
2014-06-25 11:56:36 +10:00
Shannon
acb934e3f1
ensures timer's are not GCd
2014-06-25 11:52:48 +10:00
Shannon
6485e625b1
Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
2014-06-25 11:37:21 +10:00
Shannon
3aa486a463
another log
2014-06-25 11:36:58 +10:00
Shannon
5aa0621c90
adds some notes
2014-06-25 11:36:14 +10:00
Shannon
625b8f7e65
Ensures the 'Index' portion of the path is used for scheduled publishing
2014-06-25 11:26:08 +10:00
Shannon
72b7b443e9
Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
2014-06-25 11:02:04 +10:00
Shannon
5011eee037
fixes merge issue
2014-06-25 11:00:53 +10:00
Shannon
e27163f3a7
adds logging to scheduled bits
2014-06-25 11:00:11 +10:00
Shannon
65ea6f94d3
adds authorization to the scheduled publishing , this new attribute can be used to secure scheduled tasks as well.
2014-06-23 15:02:23 +10:00
Shannon
e8f7f77bb6
Fixes: U4-581 Automatic publishing not working in load balanced setup - added some more convention and configuration to distributed calls so that servers are aware of the master and how to call into themselves for scheduled tasks, ping and scheduled publishing. Will need to update the docs on LB regarding this too. Cleaned up the code that does the scheduling and separates it into proper segments. Obsoletes the old presentation classes that were doing it.
2014-06-20 14:34:21 +10:00