Merge branch 'feature/beacon804' into release/8.0.4

# Conflicts: # DNN Platform/Website/Install/Config/08.00.04.config
dnnsoftware · Aug 17, 2016 · a51a69d · a51a69d
2 parents f1329a2 + 7dfda1a
commit a51a69d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/DNN Platform/Website/Install/Config/08.00.04.config b/DNN Platform/Website/Install/Config/08.00.04.config
@@ -1,6 +1,6 @@
 <configuration>
   <nodes configfile="web.config">
-    <node path="/configuration/appSettings" action="update" key="key" collision="ignore">
+    <node path="/configuration/appSettings" action="update" key="key" collision="overwrite">
       <add key="ImprovementProgram.Endpoint" value="https://dnnapi.com/beacon" />
     </node>
   </nodes>

diff --git a/Website/development.config b/Website/development.config
@@ -62,7 +62,7 @@
     <add key="PreserveLoginUrl" value="true" />
 	  <add key="loginUrl" value="~/Login.aspx" />
     <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
-    <add key="ImprovementProgram.Epdpoint" value="https://dev-bcn.dnnapi.com/beacon" />
+    <add key="ImprovementProgram.Endpoint" value="https://dev.dnnapi.com/beacon" />
   </appSettings>
 
   <system.web.webPages.razor>

diff --git a/Website/release.config b/Website/release.config
@@ -62,7 +62,7 @@
     <add key="PreserveLoginUrl" value="true" />
 	  <add key="loginUrl" value="~/Login.aspx" />
     <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
-    <add key="ImprovementProgram.Epdpoint" value="https://bcn.dnnapi.com/beacon" />
+    <add key="ImprovementProgram.Endpoint" value="https://dnnapi.com/beacon" />
   </appSettings>
 
   <system.web.webPages.razor>