Shannon b3cbcebf5b Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html

2018-01-15 16:27:29 +11:00

..

umbraco

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8

2018-01-15 16:27:29 +11:00

AttributeCollectionAdapter.cs

…

BasePageExtensions.cs

…

content.cs

perfs - suspendable

2017-09-06 18:50:54 +02:00

default.aspx.cs

…

EnsureSystemPathsApplicationStartupHandler.cs

…

helper.cs

U4-9971 Special "square bracket" notation in Umbraco.Field not working

2017-05-31 10:18:10 +02:00

item.cs

…

keepAliveService.cs

…

library.cs

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7

2017-09-08 18:58:48 +02:00

macro.cs

U4-10098 Update FileService to support legacy MacroScript and UserControl folders

2017-07-04 14:28:15 +02:00

MacroCacheContent.cs

…

NotFoundHandlers.cs

…

page.cs

…

publishingService.cs

…

PublishQueue.cs

…

python.cs

…

requestModule.cs

…

SafeXmlReaderWriter.cs

U4-9462 - cleanup units of work, code, fixmes

2017-02-21 13:19:58 +01:00

ScriptingMacroResult.cs

…

showField.cs

…

template.cs

Just to be sure, moves the text replacement outside of the using - though that wouldn't make any diff

2017-03-02 10:48:11 +01:00

UmbracoContext.cs

updating various references to use examine constants.

2016-08-16 13:27:46 +02:00

UmbracoPage.cs

…

umbracoPageHolder.cs

…

UmbracoRequest.cs

…

UmbracoResponse.cs

…

UmbracoServerUtility.cs

…

viewstateMoverModule.cs

…

XsltExtensionAttribute.cs

…