diff --git a/.hgignore b/.hgignore index 9a2e686628..ae3df4d9eb 100644 --- a/.hgignore +++ b/.hgignore @@ -21,4 +21,12 @@ _ReSharper*/ [sS]andbox umbraco.config *.vs10x -App_Data\TEMP\* \ No newline at end of file +App_Data\TEMP\* + +glob:*App_Data\* +glob:*media\* +glob:*masterpages\* +glob:*macroScripts\* + +umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx +umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx \ No newline at end of file diff --git a/umbraco/presentation/Web.SSAOLAP01.config b/umbraco/presentation/Web.SSAOLAP01.config new file mode 100644 index 0000000000..6d3f5ba78c --- /dev/null +++ b/umbraco/presentation/Web.SSAOLAP01.config @@ -0,0 +1,246 @@ + + + +
+ + + +
+ +
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config index 5f767b3e3e..6d3f5ba78c 100644 --- a/umbraco/presentation/web.config +++ b/umbraco/presentation/web.config @@ -39,8 +39,8 @@ - - + + @@ -62,7 +62,7 @@ Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS Alex Norcliffe 2010 02 for 4.1 --> - + @@ -233,7 +233,7 @@ - +