Sebastiaan Janssen c8a19dff44 Merge branch '6.0.7' into 6.1.2 ...

Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs

2013-06-19 18:26:45 +02:00

..

install

Merge with 4.11.7

2013-04-06 00:31:10 +06:00

umbraco

Merge branch '6.0.7' into 6.1.2

2013-06-19 18:26:45 +02:00

umbracobase

Change word deprecated to obsolete

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

AttributeCollectionAdapter.cs

Updated EditMacro.js to support inserting different syntax depending on rendering engine. Just need to get it to insert the params for MVC now.

2013-01-03 06:21:55 +03:00

BasePageExtensions.cs

…

content.cs

Updates: #U4-2192 - moves method call to be inside of the lock.

2013-05-06 15:54:55 -10:00

default.aspx.cs

Changed over all direct calls to the profiler to use DisposableTimer.DebugDuration

2013-05-13 22:17:55 -10:00

EnsureSystemPathsApplicationStartupHandler.cs

Moves some legacy classes into LegacyClasses.cs and un-seals some refreshers with comments to support legacy classes.

2013-03-18 21:18:22 +06:00

helper.cs

Removed all MiniProfile calls that were trying to be simple trace messages (not actually profiling). This doesn't actually

2013-05-12 18:06:26 -10:00

item.cs

Changed over all direct calls to the profiler to use DisposableTimer.DebugDuration

2013-05-13 22:17:55 -10:00

keepAliveService.cs

Fixes: #U4-2059 and removes un-needed ping.aspx files, cleans up some code

2013-04-05 23:28:43 +06:00

LegacyClasses.cs

updated merge

2013-03-19 23:54:56 +06:00

library.cs

presentation.library - get Xml navigator via Web.UmbracoContext

2013-04-04 05:03:01 -02:00

macro.cs

Merge branch '6.0.7' into 6.1.2

2013-06-19 18:26:45 +02:00

MacroCacheContent.cs

Fixes up some logging API issues. Fixed up tracing in the macro class. Added support for Partial View macro rendering in the macro class.

2012-12-04 11:08:02 +05:00

NotFoundHandlers.cs

Moves some legacy classes into LegacyClasses.cs and un-seals some refreshers with comments to support legacy classes.

2013-03-18 21:18:22 +06:00

page.cs

Macros - bugfix & cleanup macros

2013-03-31 18:47:37 -02:00

publishingService.cs

Merged with 4.11.7

2013-04-06 00:21:06 +06:00

PublishQueue.cs

Moved remaining classes/files into "umbraco.presentation" folder

2012-07-19 21:49:42 +06:00

python.cs

…

requestModule.cs

Obsolete's requestModule and Singleton

2013-02-19 00:50:38 +06:00

ScriptingMacroResult.cs

Fixes up some logging API issues. Fixed up tracing in the macro class. Added support for Partial View macro rendering in the macro class.

2012-12-04 11:08:02 +05:00

showField.cs

…

template.cs

Fixes: #U4-1981 - ensures template cache is properly refreshed amonsgst all servers

2013-03-22 02:08:55 +06:00

UmbracoContext.cs

Web.PublishedCache - refactor how caches manage preview

2013-03-31 18:47:25 -02:00

UmbracoPage.cs

Moved remaining classes/files into "umbraco.presentation" folder

2012-07-19 21:49:42 +06:00

umbracoPageHolder.cs

…

UmbracoRequest.cs

Began integration of Stephen's new routing logic. The sln compiles and things have been refactored

2012-07-20 01:04:35 +06:00

UmbracoResponse.cs

Began integration of Stephen's new routing logic. The sln compiles and things have been refactored

2012-07-20 01:04:35 +06:00

UmbracoServerUtility.cs

…

viewstateMoverModule.cs

…

XsltExtensionAttribute.cs

Fixes up some logging API issues. Fixed up tracing in the macro class. Added support for Partial View macro rendering in the macro class.

2012-12-04 11:08:02 +05:00