Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merges latest fixes in develop into release/9.6.0 for RC2 #3689

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Merges latest fixes in develop into release/9.6.0 for RC2 #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8071019
jQuery 3.5.0 (#3685)
bdukes Apr 15, 2020
dbf0e4e
Remove items from default web.config (#3683)
donker Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,40 +41,6 @@
</file>
</files>
</component>
<component type="Config">
<config>
<configFile>web.config</configFile>
<install>
<configuration>
<nodes>
<node path="/configuration/system.web/httpHandlers" action="update" key="path" collision="overwrite">
<add verb="*" path="Telerik.Web.UI.WebResource.axd" validate="false" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" />
</node>
<node path="/configuration/system.webServer/handlers" action="update" key="name" collision="overwrite">
<add name="Telerik.Web.UI.WebResource" verb="*" path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" preCondition="integratedMode" />
</node>
<node path="/configuration/system.webServer/modules" action="update" key="name" collision="overwrite">
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" preCondition="managedHandler" />
</node>
<node path="/configuration/system.web/httpModules" action="update" key="name" collision="overwrite">
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" />
</node>
<node path="/configuration/system.web/httpHandlers" action="update" key="path" collision="overwrite">
<add verb="*" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler, Telerik.Web.UI, Culture=neutral, PublicKeyToken=121fae78165ba3d4" validate="true" />
</node>
<node path="/configuration/system.webServer/handlers" action="update" key="name" collision="overwrite">
<add name="Telerik.Web.UI.ChartHttpHandler" verb="*" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler, Telerik.Web.UI, Culture=neutral, PublicKeyToken=121fae78165ba3d4"/>
</node>
</nodes>
</configuration>
</install>
<uninstall>
<configuration>
<nodes/>
</configuration>
</uninstall>
</config>
</component>
</components>
</package>
</packages>
Expand Down
6 changes: 3 additions & 3 deletions DNN Platform/JavaScript Libraries/jQuery/jQuery.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="jQuery" type="JavaScript_Library" version="03.04.01" isSystem="true">
<package name="jQuery" type="JavaScript_Library" version="03.05.00" isSystem="true">
<friendlyName>jQuery JavaScript Library</friendlyName>
<description>jQuery is a JavaScript library that is used to manipulate the Document Object Model (DOM).</description>
<iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
Expand All @@ -19,7 +19,7 @@
<libraryName>jQuery</libraryName>
<fileName>jquery.js</fileName>
<objectName>jQuery</objectName>
<CDNPath>//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js</CDNPath>
<CDNPath>https://code.jquery.com/jquery-3.5.0.min.js</CDNPath>
</javaScriptLibrary>
</component>
<component type="JavaScriptFile">
Expand All @@ -37,4 +37,4 @@
</components>
</package>
</packages>
</dotnetnuke>
</dotnetnuke>
4 changes: 2 additions & 2 deletions DNN Platform/JavaScript Libraries/jQuery/jquery.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DNN Platform/JavaScript Libraries/jQuery/jquery.min.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions DNN Platform/JavaScript Libraries/jQueryMigrate/jQueryMigrate.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="jQuery-Migrate" type="JavaScript_Library" version="03.01.00" isSystem="true">
<package name="jQuery-Migrate" type="JavaScript_Library" version="03.02.00" isSystem="true">
<friendlyName>jQuery Migrate JavaScript Library</friendlyName>
<description>jQuery Migrate is a JavaScript library that is used to mintain jQuery backwards compatability.</description>
<description>A development tool to help migrate away from APIs and features that have been or will be removed from jQuery core</description>
<iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
<owner>
<name>DNN</name>
Expand All @@ -21,7 +21,7 @@
<javaScriptLibrary>
<libraryName>jQuery-Migrate</libraryName>
<fileName>jquery-migrate.js</fileName>
<CDNPath>//code.jquery.com/jquery-migrate-3.1.0.min.js</CDNPath>
<CDNPath>https://code.jquery.com/jquery-migrate-3.2.0.min.js</CDNPath>
</javaScriptLibrary>
</component>
<component type="JavaScriptFile">
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/JavaScript Libraries/jQueryMigrate/jquery-migrate.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions DNN Platform/Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
<add name="DNNMembership" type="DotNetNuke.HttpModules.Membership.MembershipModule, DotNetNuke.HttpModules" preCondition="managedHandler" />
<add name="Personalization" type="DotNetNuke.HttpModules.Personalization.PersonalizationModule, DotNetNuke.HttpModules" preCondition="managedHandler" />
<add name="Analytics" type="DotNetNuke.HttpModules.Analytics.AnalyticsModule, DotNetNuke.HttpModules" preCondition="managedHandler" />
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" preCondition="managedHandler" />
<add name="Services" type="DotNetNuke.HttpModules.Services.ServicesModule, DotNetNuke.HttpModules" />
</modules>
<handlers>
Expand All @@ -79,10 +78,7 @@
<add name="RSSHandler" path="RSS.aspx" verb="*" type="DotNetNuke.Services.Syndication.RssHandler, DotNetNuke" preCondition="integratedMode" />
<add name="LinkClickHandler" path="LinkClick.aspx" verb="*" type="DotNetNuke.Services.FileSystem.FileServerHandler, DotNetNuke" preCondition="integratedMode" />
<add name="CaptchaHandler" path="*.captcha.aspx" verb="*" type="DotNetNuke.UI.WebControls.CaptchaHandler, DotNetNuke" preCondition="integratedMode" />
<add name="Telerik.Web.UI.WebResource" verb="*" path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" preCondition="integratedMode" />
<add name="Telerik.Web.UI.ChartHttpHandler" path="ChartImage.axd" verb="*" type="Telerik.Web.UI.ChartHttpHandler, Telerik.Web.UI, Culture=neutral, PublicKeyToken=121fae78165ba3d4" preCondition="integratedMode" />
<add name="UserProfilePageHandler" path="User.aspx" verb="*" type="DotNetNuke.Services.UserProfile.UserProfilePageHandler, DotNetNuke" preCondition="integratedMode" />
<add name="RadProgressHandler" verb="*" path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.Upload.RadUploadProgressHandler, Telerik.Web.UI" preCondition="integratedMode" />
<add name="UserProfilePicHandler" path="ProfilePic.ashx" verb="*" type="DotNetNuke.Services.UserProfile.UserProfilePicHandler, DotNetNuke" preCondition="integratedMode" />
</handlers>
<validation validateIntegratedModeConfiguration="false" />
Expand All @@ -98,7 +94,6 @@
<add name="DNNMembership" type="DotNetNuke.HttpModules.Membership.MembershipModule, DotNetNuke.HttpModules" />
<add name="Personalization" type="DotNetNuke.HttpModules.Personalization.PersonalizationModule, DotNetNuke.HttpModules" />
<add name="Analytics" type="DotNetNuke.HttpModules.Analytics.AnalyticsModule, DotNetNuke.HttpModules" />
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" />
<add name="Services" type="DotNetNuke.HttpModules.Services.ServicesModule, DotNetNuke.HttpModules" />
</httpModules>
<httpHandlers>
Expand All @@ -111,10 +106,7 @@
<!-- This adds legacy support for the Logoff page -->
<add verb="*" path="Logoff.aspx" type="DotNetNuke.Services.Authentication.LogOffHandler, DotNetNuke" />
<!-- ASP.NET AJAX support -->
<add verb="*" path="Telerik.Web.UI.WebResource.axd" validate="false" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" />
<add path="ChartImage.axd" verb="*" type="Telerik.Web.UI.ChartHttpHandler, Telerik.Web.UI, Culture=neutral, PublicKeyToken=121fae78165ba3d4" validate="true" />
<add path="User.aspx" verb="*" type="DotNetNuke.Services.UserProfile.UserProfilePageHandler, DotNetNuke" />
<add verb="*" path="Telerik.RadUploadProgressHandler.ashx" type="Telerik.Web.UI.Upload.RadUploadProgressHandler, Telerik.Web.UI" />
<add path="ProfilePic.ashx" verb="*" type="DotNetNuke.Services.UserProfile.UserProfilePicHandler, DotNetNuke" />
</httpHandlers>
<!-- set code access security trust level - this is generally set in the machine.config
Expand Down
10 changes: 5 additions & 5 deletions DNN Platform/Website/Install/Config/05.02.00.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
</outputCaching>
</node>
<node path="/configuration/system.web/httpHandlers" action="update" key="path" collision="overwrite">
<add verb="*" path="Telerik.Web.UI.WebResource.axd" validate="false" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" />
<add verb="*" path="Telerik.Web.UI.WebResource.axd" validate="false" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" />
</node>
<node path="/configuration/system.webServer/handlers" action="update" key="name" collision="overwrite">
<add name="Telerik.Web.UI.WebResource" verb="*" path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" />
<add name="Telerik.Web.UI.WebResource" verb="*" path="Telerik.Web.UI.WebResource.axd" type="Telerik.Web.UI.WebResource, Telerik.Web.UI" />
</node>
<node path="/configuration/system.webServer/modules" action="update" key="name" collision="overwrite">
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" preCondition="managedHandler" />
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" preCondition="managedHandler" />
</node>
<node path="/configuration/system.web/httpModules" action="update" key="name" collision="overwrite">
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" />
<add name="RadUploadModule" type="Telerik.Web.UI.RadUploadHttpModule, Telerik.Web.UI" />
</node>
</nodes>
</configuration>
</configuration>
2 changes: 1 addition & 1 deletion DNN Platform/Website/Install/Config/05.02.01.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
<add name="Telerik.Web.UI.ChartHttpHandler" verb="*" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler, Telerik.Web.UI, Culture=neutral, PublicKeyToken=121fae78165ba3d4" />
</node>
</nodes>
</configuration>
</configuration>
10 changes: 9 additions & 1 deletion DNN Platform/Website/Install/Config/09.06.00.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<configuration>
<nodes configfile="Web.config">
<nodes configfile="Web.config">
<node path="/configuration/system.web/httpHandlers/add[@name='Telerik.Web.UI.ChartHttpHandler']" action="remove" />
<node path="/configuration/system.webServer/handlers/add[@name='Telerik.Web.UI.ChartHttpHandler']" action="remove" />
<node path="/configuration/system.web/httpModules/add[@name='RadUploadModule']" action="remove" />
<node path="/configuration/system.webServer/modules/add[@name='RadUploadModule']" action="remove" />
<node path="/configuration/system.webServer/handlers/add[@name='Telerik.Web.UI.WebResource']" action="remove" />
<node path="/configuration/system.web/httpHandlers/add[@name='Telerik.Web.UI.WebResource']" action="remove" />
<node path="/configuration/appSettings" action="update" key="key" collision="overwrite">
<add key="Telerik.Upload.AllowedCustomMetaDataTypes" value="Telerik.Web.UI.AsyncUploadConfiguration" />
<add key="UpdateServiceUrl" value="https://dnnplatform.io" />
</node>
</nodes>
</configuration>