Stephan
|
c6e4e3b3ed
|
Merge origin/dev-v7-deploy into dev-v8-zbwip
|
2016-11-04 18:40:42 +01:00 |
|
Stephan
|
8fa1499a2f
|
Merge origin/dev-v7 into dev-v7-deploy
|
2016-11-04 12:18:39 +01:00 |
|
Stephan
|
b29bc66026
|
Post-merge fixing & refactoring (tests ok)
|
2016-11-04 11:36:58 +01:00 |
|
Stephan
|
74e0a4d999
|
7.6 merge review fixes
|
2016-11-03 19:20:42 +01:00 |
|
Stephan
|
b26b415096
|
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
|
2016-11-03 10:31:44 +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 |
|
Stephan
|
3f22e727f6
|
Some things need to be public/adjusted for Deploy
|
2016-09-23 16:42:42 +02:00 |
|
Stephan
|
0597eea72b
|
Resvolution - Components, Runtime & Booting
|
2016-09-19 16:33:43 +02:00 |
|
Stephan
|
3fc76f61d0
|
MainDom - fixing application identifier
|
2016-09-05 12:33:26 +02:00 |
|
Stephan
|
bf22954abc
|
Bugfix - MainDom must accept duplicate callback weights
|
2016-07-21 10:23:29 +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 |
|