Stephan
|
c77174059d
|
Backport MainDom cleanup from 7.6
|
2016-10-31 11:06:17 +01:00 |
|
Stephan
|
71afe908b4
|
U4-9101 - comments and misc
|
2016-10-26 18:01:32 +02:00 |
|
Shannon
|
f153332ad5
|
updates logging levels for MainDom
|
2016-10-25 16:56:55 +02:00 |
|
Shannon
|
ba1d546579
|
Merge remote-tracking branch 'origin/master-v7' into dev-v7
Conflicts:
src/Umbraco.Core/MainDom.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Tests/packages.config
src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/packages.config
src/UmbracoExamine/UmbracoExamine.csproj
src/umbraco.MacroEngines/packages.config
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
|
2015-07-15 14:58:19 +02:00 |
|
Sebastiaan Janssen
|
d2f7eda074
|
Fixes unit test that failed because HostingEnvironment.ApplicationID is null in unit tests
|
2015-07-15 10:58:38 +02:00 |
|
Stephan
|
d386c069ee
|
Post-merge
|
2015-07-13 22:57:38 +02:00 |
|
Shannon
|
6aa633c8c5
|
changes app timeout to 1.5 mins
|
2015-07-13 17:10:35 +02:00 |
|
Stephan
|
c01f864e37
|
ApplicationContext - manage MainDom
Conflicts:
src/Umbraco.Core/ApplicationContext.cs
src/Umbraco.Core/Umbraco.Core.csproj
|
2015-07-13 14:41:07 +02:00 |
|