Merge pull request Sitefinity#43 from Sitefinity/upgrade-90

Reupgraded dev magazine
jackyhjj · Mar 24, 2016 · b0f36ba · b0f36ba
2 parents e6e465f + 52cf26e
commit b0f36ba
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 2 deletions.
diff --git a/DevMagazineSite/SitefinityWebApp/App_Data/DevMagazine.bak b/DevMagazineSite/SitefinityWebApp/App_Data/DevMagazine.bak
diff --git a/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/_1p_1.del b/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/_1p_1.del
diff --git a/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/_1q.cfs b/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/_1q.cfs
diff --git a/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/segments.gen b/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/segments.gen
diff --git a/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/segments_30 b/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/segments_30
diff --git a/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/segments_32 b/DevMagazineSite/SitefinityWebApp/App_Data/Sitefinity/Search/main/segments_32
diff --git a/...neSite/SitefinityWebApp/ResourcePackages/BootstrapCustom/MVC/Views/Layouts/default.cshtml b/...neSite/SitefinityWebApp/ResourcePackages/BootstrapCustom/MVC/Views/Layouts/default.cshtml
@@ -10,7 +10,9 @@
     <link rel="stylesheet" href='~/ResourcePackages/BootstrapCustom/assets/dist/css/styles.min.css' type="text/css" />
 </head>
 <body>
-    @Html.SfPlaceHolder("ContainerPlaceholder")
+    <div class="sfPublicWrapper" id="PublicWrapper">		
+        @Html.SfPlaceHolder("Contentplaceholder1")		
+    </div>
 
 	<script src="~/ResourcePackages/BootstrapCustom/assets/dist/js/all.min.js"></script>
 

diff --git a/DevMagazineSite/SitefinityWebApp/web.config b/DevMagazineSite/SitefinityWebApp/web.config
@@ -17,6 +17,9 @@
       <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
       <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
     </sectionGroup>
+    <sectionGroup name="telerik">
+      <section name="sitefinity" type="Telerik.Sitefinity.Configuration.SectionHandler, Telerik.Sitefinity" requirePermission="false" />
+    </sectionGroup>
   </configSections>
   <appSettings>
     <add key="TestLocalization" value="false" />
@@ -119,7 +122,8 @@ that is bundled with the nuget package under the tools folder.
         <add assembly="System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
         <add assembly="WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
         <add assembly="PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      <add assembly="Telerik.OpenAccess, Version=2016.1.224.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342" /></assemblies>
+        <add assembly="Telerik.OpenAccess, Version=2016.1.224.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342" />
+      </assemblies>
       <buildProviders>
         <remove extension=".svc" />
         <add extension=".svc" type="System.ServiceModel.Activation.ServiceBuildProvider, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
@@ -377,4 +381,20 @@ that is bundled with the nuget package under the tools folder.
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <telerik>
+    <sitefinity>
+      <testing enabled="true" loadBalancingSyncLoggingEnabled="false" />
+      <environment platform="WindowsAzure" />
+      <sitefinityConfig storageMode="Database" />
+    </sitefinity>
+  </telerik>
+  <system.diagnostics>
+    <trace>
+      <listeners>
+        <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics">
+          <filter type="" />
+        </add>
+      </listeners>
+    </trace>
+  </system.diagnostics>
 </configuration>