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

..

splashes

Update booting.aspx

2014-01-24 12:36:02 +11:00

404handlers.config

U4-2549 - fix it differently

2013-08-29 17:08:16 +02:00

404handlers.Release.config

U4-2549 - fix it differently

2013-08-29 17:08:16 +02:00

applications.config

Adds forms to the default app.config

2014-10-25 01:10:08 +02:00

applications.Release.config

WIP on background package installs

2014-08-18 20:42:56 +02:00

BaseRestExtensions.config

Removes uGoLive from the core (for now until it is rebuilt against v7 )

2013-11-28 10:51:54 +11:00

BaseRestExtensions.Release.config

…

ClientDependency.config

tuning config for current umbraco kit starter

2014-08-07 18:11:50 +02:00

ClientDependency.Release.config

Completes: U4-3712 Allow c# property editors to have custom js injected into the js initialization block so they can load in angular controllers

2013-11-28 14:27:58 +11:00

Dashboard.config

Added a new dashboard to rebuild xml structures for content, members, media. I haven't put it in the release dashboard config for now. Also added methods to the examine controller to check the index integrity which we can use for th 7.3 task.

2014-10-23 18:52:11 +10:00

Dashboard.Release.config

Merge remote-tracking branch 'origin/7.2.0-WIPFormsInstallDashboard' into 7.2.0

2014-09-22 21:03:09 +02:00

EmbeddedMedia.config

Oembed for slideshare not working anymore

2014-05-13 22:29:59 +02:00

EmbeddedMedia.Release.config

Oembed for slideshare not working anymore

2014-05-13 22:29:59 +02:00

ExamineIndex.config

removed test examine settings

2013-08-14 10:08:59 +10:00

ExamineIndex.Release.config

…

ExamineSettings.config

Fixed U4-4576 7.0.4 : InternalMemberSearcher config incorrectly uses 'enableLeadingWildcards', should be 'enableLeadingWildcard'

2014-04-01 11:53:56 +02:00

ExamineSettings.Release.config

Fixed U4-4576 7.0.4 : InternalMemberSearcher config incorrectly uses 'enableLeadingWildcards', should be 'enableLeadingWildcard'

2014-04-01 11:53:56 +02:00

feedProxy.config

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

2014-02-25 02:24:45 +11:00

feedProxy.Release.config

Wires up the help dialog with our and tv feeds

2013-10-29 21:49:40 +01:00

FileSystemProviders.config

Been a while: properly syncing /config/*.config with /config/*.Release.config

2014-02-21 17:50:58 +01:00

FileSystemProviders.Release.config

…

grid.editors.config.js

Renames canvas editor into grid again

2014-10-07 13:39:18 +02:00

log4net.config

By default, changes all log output for NH to be Warn

2014-11-12 16:02:02 +11:00

log4net.Release.config

By default, changes all log output for NH to be Warn

2014-11-12 16:02:02 +11:00

metablogConfig.config

Removes the various old hacks for the legacy user's membership provider, now that we have the AllowManuallyChangingPassword flag, these hacks are not required.

2014-02-17 19:32:04 +11:00

metablogConfig.Release.config

…

scripting.config

Been a while: properly syncing /config/*.config with /config/*.Release.config

2014-02-21 17:50:58 +01:00

scripting.Release.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00

tinyMceConfig.config

updated some of the table styling, updated the path to be relative and updated the release config.

2014-10-16 17:38:36 +10:00

tinyMceConfig.Release.config

reverts codemirror tinymce editor from release until we can fix the IE issue with it, people can still enable it if they want though.

2014-11-12 10:05:20 +11:00

trees.config

Fixes: U4-4828 Disable "Scripting Files" tree and don't ship the macroScripts folder

2014-10-16 15:37:32 +10:00

trees.Release.config

Fixes: U4-4828 Disable "Scripting Files" tree and don't ship the macroScripts folder

2014-10-16 15:37:32 +10:00

umbracoSettings.config

Merge remote-tracking branch 'origin/7.1.5' into 7.2.0

2014-08-04 13:32:44 +02:00

umbracoSettings.Release.config

Bring preview badge waaay to the foreground

2014-09-22 16:05:28 +02:00

UrlRewriting.config

Been a while: properly syncing /config/*.config with /config/*.Release.config

2014-02-21 17:50:58 +01:00

UrlRewriting.Release.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00