Shannon 24a76f53b4 Merge branch '6.0.7' into 6.1.2 ...

Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs

2013-06-20 15:49:55 +10:00

..

splashes

Fixes merge issues

2013-04-06 01:41:06 +06:00

404handlers.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

404handlers.Release.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

applications.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

applications.Release.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

BaseRestExtensions.config

fix config files for BaseRestExtension.config

2012-10-06 07:20:12 -02:00

BaseRestExtensions.Release.config

fix config files for BaseRestExtension.config

2012-10-06 07:20:12 -02:00

ClientDependency.config

Merge branch '6.0.7' into 6.1.2

2013-06-20 15:49:55 +10:00

ClientDependency.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

Dashboard.config

Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure.

2013-06-20 15:34:57 +10:00

Dashboard.Release.config

Fix missing Examine dashboard

2013-05-30 10:26:54 -02:00

EmbeddedMedia.config

Embed classes internal -> public.

2012-09-06 15:23:42 -02:00

EmbeddedMedia.Release.config

Embed classes internal -> public.

2012-09-06 15:23:42 -02:00

ExamineIndex.config

Merge with 6.0.1

2013-02-26 21:42:55 +06:00

ExamineIndex.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

ExamineSettings.config

Update to latest examine (bug fixed), started Examine Management dashboard FF project.

2013-02-23 23:00:31 +06:00

ExamineSettings.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

feedProxy.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

feedProxy.Release.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

FileSystemProviders.config

Fixes PhysicalFileSystem to use IOHelper instead of HostingEnvironment. Removes all references to new IFileSystem's that canont be supported currently, leaving only the media file system.

2013-01-14 03:04:09 +03:00

FileSystemProviders.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

log4net.config

Added App_Code assembly loading to new type finder, had to recompile log4net to support medium trust.

2012-08-04 06:07:29 +06:00

log4net.Release.config

Added Log4Net and supporting classes from v5 in order to start integration of new diagnostic logging system.

2012-07-28 01:28:39 +06:00

metablogConfig.config

Fixes: #U4-1697 - streamlines user cache invalidation/adds new UserCacheRefresher.

2013-02-12 04:13:29 +06:00

metablogConfig.Release.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

restExtensions.config

Committing configs with correct spacing

2012-12-05 12:37:21 -01:00

restExtensions.Release.config

fix BaseRest config management - would throw when missing config files

2012-11-01 16:46:04 -01:00

scripting.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

scripting.Release.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

Skinning.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

Skinning.Release.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

tinyMceConfig.config

Fixed some attributes in tinyMCEConfig.config U4-717 and U4-1006

2012-10-25 09:02:33 -02:00

tinyMceConfig.Release.config

Update the tinyMCE release config as well for U4-717 and u4-1006

2012-10-31 10:11:02 -01:00

trees.config

Fixes uGoLive id and changes dashboard ascx to use CDF to load scripts/styles and using the knockout version shipped in the core.

2013-02-01 06:05:39 +06:00

trees.Release.config

Got partial view tree and partial view macros tree done. Need to get the custom create dialogs done now.

2012-12-31 02:51:30 +03:00

umbracoSettings.config

Fixes up tree syncing for views, stylesheets and partial views. Now ensures we can actually

2013-05-08 14:18:18 -10:00

umbracoSettings.Release.config

Merge with 6.0.4

2013-04-19 04:40:49 +06:00

UrlRewriting.config

Change word deprecated to obsolete

2013-01-08 13:27:16 -01:00

UrlRewriting.Release.config

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

xsltExtensions.config

Adds patch fixes for #U4-1653

2013-02-07 02:07:07 +06:00

xsltExtensions.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00