From 1fdf88a1a1421aa4efef5986e30f8198c7018ba0 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Wed, 18 Aug 2021 09:05:12 -0500 Subject: [PATCH 01/56] Avoid HTML module using Globals.DependencyProvider Most usages aren't necessary --- .../HTML/Components/HtmlTextController.cs | 7 ++++++- DNN Platform/Modules/HTML/EditHtml.ascx.cs | 3 ++- DNN Platform/Modules/HTML/HtmlModule.ascx.cs | 10 +++++----- DNN Platform/Modules/HTML/Settings.ascx.cs | 18 ++++++++++++++---- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/DNN Platform/Modules/HTML/Components/HtmlTextController.cs b/DNN Platform/Modules/HTML/Components/HtmlTextController.cs index 0fd2f5f4229..12e9ff1410d 100644 --- a/DNN Platform/Modules/HTML/Components/HtmlTextController.cs +++ b/DNN Platform/Modules/HTML/Components/HtmlTextController.cs @@ -50,8 +50,13 @@ public class HtmlTextController : ModuleSearchBase, IPortable, IUpgradeable private const string PortalRootToken = "{{PortalRoot}}"; public HtmlTextController() + : this(Globals.DependencyProvider.GetRequiredService()) { - this.NavigationManager = Globals.DependencyProvider.GetRequiredService(); + } + + public HtmlTextController(INavigationManager navigationManager) + { + this.NavigationManager = navigationManager; } protected INavigationManager NavigationManager { get; } diff --git a/DNN Platform/Modules/HTML/EditHtml.ascx.cs b/DNN Platform/Modules/HTML/EditHtml.ascx.cs index d3a0ea7a7d4..285991cdf73 100644 --- a/DNN Platform/Modules/HTML/EditHtml.ascx.cs +++ b/DNN Platform/Modules/HTML/EditHtml.ascx.cs @@ -33,13 +33,14 @@ public partial class EditHtml : HtmlModuleBase { private readonly INavigationManager _navigationManager; - private readonly HtmlTextController _htmlTextController = new HtmlTextController(); + private readonly HtmlTextController _htmlTextController; private readonly HtmlTextLogController _htmlTextLogController = new HtmlTextLogController(); private readonly WorkflowStateController _workflowStateController = new WorkflowStateController(); public EditHtml() { this._navigationManager = this.DependencyProvider.GetRequiredService(); + this._htmlTextController = new HtmlTextController(this._navigationManager); } private enum WorkflowType diff --git a/DNN Platform/Modules/HTML/HtmlModule.ascx.cs b/DNN Platform/Modules/HTML/HtmlModule.ascx.cs index 3deafa91492..fbf4cd98815 100644 --- a/DNN Platform/Modules/HTML/HtmlModule.ascx.cs +++ b/DNN Platform/Modules/HTML/HtmlModule.ascx.cs @@ -65,7 +65,7 @@ public ModuleActionCollection ModuleActions false); // get the content - var objHTML = new HtmlTextController(); + var objHTML = new HtmlTextController(this._navigationManager); var objWorkflow = new WorkflowStateController(); this.WorkflowID = objHTML.GetWorkflow(this.ModuleId, this.TabId, this.PortalId).Value; @@ -159,7 +159,7 @@ protected override void OnInit(EventArgs e) this.EditorEnabled = this.PortalSettings.InlineEditorEnabled; try { - this.WorkflowID = new HtmlTextController().GetWorkflow(this.ModuleId, this.TabId, this.PortalId).Value; + this.WorkflowID = new HtmlTextController(this._navigationManager).GetWorkflow(this.ModuleId, this.TabId, this.PortalId).Value; // Add an Action Event Handler to the Skin this.AddActionHandler(this.ModuleAction_Click); @@ -182,7 +182,7 @@ protected override void OnLoad(EventArgs e) base.OnLoad(e); try { - var objHTML = new HtmlTextController(); + var objHTML = new HtmlTextController(this._navigationManager); // edit in place if (this.EditorEnabled && this.IsEditable && Personalization.GetUserMode() == PortalSettings.Mode.Edit) @@ -290,7 +290,7 @@ private void lblContent_UpdateLabel(object source, DNNLabelEditEventArgs e) else if (this.EditorEnabled && this.IsEditable && Personalization.GetUserMode() == PortalSettings.Mode.Edit) { // get content - var objHTML = new HtmlTextController(); + var objHTML = new HtmlTextController(this._navigationManager); var objWorkflow = new WorkflowStateController(); HtmlTextInfo objContent = objHTML.GetTopHtmlText(this.ModuleId, false, this.WorkflowID); if (objContent == null) @@ -336,7 +336,7 @@ private void ModuleAction_Click(object sender, ActionEventArgs e) if (this.IsEditable && Personalization.GetUserMode() == PortalSettings.Mode.Edit) { // get content - var objHTML = new HtmlTextController(); + var objHTML = new HtmlTextController(this._navigationManager); HtmlTextInfo objContent = objHTML.GetTopHtmlText(this.ModuleId, false, this.WorkflowID); var objWorkflow = new WorkflowStateController(); diff --git a/DNN Platform/Modules/HTML/Settings.ascx.cs b/DNN Platform/Modules/HTML/Settings.ascx.cs index dd83c3a8b9f..4e8d5f501dc 100644 --- a/DNN Platform/Modules/HTML/Settings.ascx.cs +++ b/DNN Platform/Modules/HTML/Settings.ascx.cs @@ -5,11 +5,14 @@ namespace DotNetNuke.Modules.Html { using System; using System.Collections; - using System.Collections.Generic; + using System.Collections.Generic; + using DotNetNuke.Abstractions; using DotNetNuke.Entities.Modules; using DotNetNuke.Modules.Html.Components; - using DotNetNuke.Services.Exceptions; + using DotNetNuke.Services.Exceptions; + + using Microsoft.Extensions.DependencyInjection; /// /// The Settings ModuleSettingsBase is used to manage the @@ -21,6 +24,13 @@ public partial class Settings : ModuleSettingsBase { private HtmlModuleSettings _moduleSettings; + private readonly INavigationManager _navigationManager; + + public Settings() + { + this._navigationManager = this.DependencyProvider.GetRequiredService(); + } + private new HtmlModuleSettings ModuleSettings { get @@ -40,7 +50,7 @@ public override void LoadSettings() { if (!this.Page.IsPostBack) { - var htmlTextController = new HtmlTextController(); + var htmlTextController = new HtmlTextController(this._navigationManager); var workflowStateController = new WorkflowStateController(); this.chkReplaceTokens.Checked = this.ModuleSettings.ReplaceTokens; @@ -89,7 +99,7 @@ public override void UpdateSettings() { try { - var htmlTextController = new HtmlTextController(); + var htmlTextController = new HtmlTextController(this._navigationManager); // update replace token setting this.ModuleSettings.ReplaceTokens = this.chkReplaceTokens.Checked; From 94e37aef3847fe5d2c79214c727b453e3de49adb Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Thu, 19 Aug 2021 08:32:41 -0500 Subject: [PATCH 02/56] Resolve serialization issue Fixes #3592 --- .../AuthenticationConfigBase.cs | 74 ++++++++----------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs b/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs index a8a0aee0509..e47992808cd 100644 --- a/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs +++ b/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs @@ -1,50 +1,40 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information -namespace DotNetNuke.Services.Authentication -{ - using System; - using System.ComponentModel; +namespace DotNetNuke.Services.Authentication +{ + using System; + using System.ComponentModel; - using DotNetNuke.Common; + using DotNetNuke.Common; - /// ----------------------------------------------------------------------------- - /// - /// The AuthenticationConfigBase class provides base configuration class for the - /// Authentication providers. - /// - /// ----------------------------------------------------------------------------- - [Serializable] - public abstract class AuthenticationConfigBase + /// ----------------------------------------------------------------------------- + /// + /// The AuthenticationConfigBase class provides base configuration class for the + /// Authentication providers. + /// + /// ----------------------------------------------------------------------------- + [Serializable] + public abstract class AuthenticationConfigBase { - /// - /// Initializes a new instance of the class. - /// - public AuthenticationConfigBase() - { - this.DependencyProvider = Globals.DependencyProvider; + /// Initializes a new instance of the class. + public AuthenticationConfigBase() + { } - /// - /// Initializes a new instance of the class. - /// - /// - protected AuthenticationConfigBase(int portalID) - : this() - { - this.PortalID = portalID; - } - - [Browsable(false)] - public int PortalID { get; set; } - - /// - /// Gets the Dependency Provider to resolve registered - /// services with the container. - /// - /// - /// The Dependency Service. - /// - protected IServiceProvider DependencyProvider { get; } - } -} + /// Initializes a new instance of the class. + /// The portal ID. + protected AuthenticationConfigBase(int portalID) + : this() + { + this.PortalID = portalID; + } + + [Browsable(false)] + public int PortalID { get; set; } + + /// Gets the Dependency Provider to resolve registered services with the container. + [NonSerialized] + protected IServiceProvider DependencyProvider => Globals.DependencyProvider; + } +} From 54a46e364b51eb649156111362d477254f61cc45 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Thu, 19 Aug 2021 08:42:56 -0500 Subject: [PATCH 03/56] NonSerialized can only apply to a field Using a computed property instead of a property with a backing field should be enough to avoid the serialization issue --- .../Library/Services/Authentication/AuthenticationConfigBase.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs b/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs index e47992808cd..41b30e8df10 100644 --- a/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs +++ b/DNN Platform/Library/Services/Authentication/AuthenticationConfigBase.cs @@ -34,7 +34,6 @@ protected AuthenticationConfigBase(int portalID) public int PortalID { get; set; } /// Gets the Dependency Provider to resolve registered services with the container. - [NonSerialized] protected IServiceProvider DependencyProvider => Globals.DependencyProvider; } } From e378c360f078e32a0405d497ecd7d60847f01189 Mon Sep 17 00:00:00 2001 From: Peter Schotman Date: Fri, 20 Aug 2021 10:23:51 +0200 Subject: [PATCH 04/56] IE11 corrections --- .../Dnn.EditBar.UI/editBar/css/main.css | 7 +++ .../admin/personaBar/css/main.css | 53 ++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/css/main.css b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/css/main.css index 9c58cb202bc..56aa2283cf7 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/css/main.css +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/css/main.css @@ -194,4 +194,11 @@ body { #editBarOptionsExtensionPoint { margin-left: 7px; +} + +/* IE10+ specific editbar styles go here */ +@media screen and (-ms-high-contrast: active), screen and (-ms-high-contrast: none) { + .editbar { + background-color: #0b1c24; + } } \ No newline at end of file diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css index 120c390d623..689ccca4435 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css @@ -2369,4 +2369,55 @@ div.ui-dialog-titlebar>.ui-dialog-titlebar-close:hover { .monaco-editor .view-lines * { font-family: inherit; -} \ No newline at end of file +} + + + +/* IE10+ specific personabar styles go here */ +@media screen and (-ms-high-contrast: active), screen and (-ms-high-contrast: none) { + .personabar { + background-color: #0e2936; + } + + .personabar .personabarLogo { + background: url("../images/Logo.svg") no-repeat center center; + border-bottom: 1px solid #1e485e; + } + + .personabar .personabarLogo:hover { + background-color: #0b1c24; + } + + .personabarnav > li > span.icon-loader svg .back { + fill: #0b1c24; + } + + .personabarnav > li > span.icon-loader svg .main { + fill: #3c7a9a; + } + + .personabarnav > li:hover, + .personabarnav > li.active { + background-color: #0b1c24; + } + + .personabarnav > li#Edit { + border-top: 1px solid #1e485e; + } + + .hovermenu { + background-color: #0b1c24; + } + + .hoverSummaryMenu { + background-color: #0b1c24; + } + + .hoverSummaryMenu ul li.border { + border-left: 1px solid #3c7a9a; + } + + .hoverSummaryMenu ul li label { + color: #3c7a9a; + } +} From f97c8b80ff34622d24c444d930765f09ab85883f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 22:07:28 +0000 Subject: [PATCH 05/56] Bump peter-evans/create-pull-request from 3.10.0 to 3.10.1 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.10.0...v3.10.1) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/image-actions.yml | 2 +- .github/workflows/updateVersions.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image-actions.yml b/.github/workflows/image-actions.yml index 637d8cd7f80..7fa214674e2 100644 --- a/.github/workflows/image-actions.yml +++ b/.github/workflows/image-actions.yml @@ -34,7 +34,7 @@ jobs: - name: Create Pull Request if: | # If it's not a Pull Request then commit any changes as a new PR. github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != '' - uses: peter-evans/create-pull-request@v3.10.0 + uses: peter-evans/create-pull-request@v3.10.1 with: title: Auto Compress Images branch-suffix: timestamp diff --git a/.github/workflows/updateVersions.yml b/.github/workflows/updateVersions.yml index 73bcc415028..39e452a6f78 100644 --- a/.github/workflows/updateVersions.yml +++ b/.github/workflows/updateVersions.yml @@ -23,7 +23,7 @@ jobs: includePackageJson: true includeDnnReactCommon: true - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.10.0 + uses: peter-evans/create-pull-request@v3.10.1 with: commit-message: Updates versions as per release candidate creation title: Updates versions as per release candidate creation From 42cc1ce8efb4eab7c8a164debaf1011a8fe84ca1 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Tue, 24 Aug 2021 16:37:04 -0400 Subject: [PATCH 06/56] Updates issue template as per current state Updates issue template as per current state --- .github/ISSUE_TEMPLATE/bug-report.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index ddc0e0134d4..8669b68a71b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -41,8 +41,7 @@ Provide any additional context that may be helpful in understanding and/or resol Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums --> * [ ] 10.00.00 alpha build -* [ ] 09.10.01 release candidate -* [ ] 09.10.00 latest supported release +* [ ] 09.10.01 latest supported release ## Affected browser * [ ] 10.00.00 alpha build +* [ ] 09.10.02 release candidate * [ ] 09.10.01 latest supported release ## Affected browser diff --git a/Build/Symbols/DotNetNuke_Symbols.dnn b/Build/Symbols/DotNetNuke_Symbols.dnn index cd7af8dd8ed..28970149c60 100644 --- a/Build/Symbols/DotNetNuke_Symbols.dnn +++ b/Build/Symbols/DotNetNuke_Symbols.dnn @@ -1,6 +1,6 @@  - + DNN Platform Symbols This package contains Debug Symbols and Intellisense files for DNN Platform. diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn index 45e9a7fc431..3b316789f0d 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn @@ -1,6 +1,6 @@  - + Console Display children pages as icon links for navigation. ~/DesktopModules/Admin/Console/console.png diff --git a/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn b/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn index cc9ab9e52d0..810cac2733a 100644 --- a/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn +++ b/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Telerik Web Components Provides Telerik Components for DotNetNuke. diff --git a/DNN Platform/Connectors/Azure/AzureConnector.dnn b/DNN Platform/Connectors/Azure/AzureConnector.dnn index 9acbb14ced0..e1bd9f18bb5 100644 --- a/DNN Platform/Connectors/Azure/AzureConnector.dnn +++ b/DNN Platform/Connectors/Azure/AzureConnector.dnn @@ -1,6 +1,6 @@  - + Dnn Azure Connector The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module. ~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png diff --git a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn index 09d3626de95..a4888620f61 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn +++ b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn @@ -1,6 +1,6 @@ - + Google Analytics Connector Configure your sites Google Analytics settings. ~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png diff --git a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn index afde41739ad..057f1f91700 100644 --- a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn +++ b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn @@ -1,6 +1,6 @@ - + Google Tag Manager Connector Configure your sites Google Tag Manager settings. ~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn index 2a7f3ae55a1..a49dc005d76 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn +++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn @@ -1,6 +1,6 @@ - + DNN JWT Auth Handler DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients diff --git a/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn b/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn index 3940746c6f1..3684943c791 100644 --- a/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn +++ b/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn @@ -1,6 +1,6 @@  - + DNN Deprecated Web Controls Library DNN Deprecated Web Controls library for legacy Telerik depepndency diff --git a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn index a9e6bd971cf..893231adfb4 100644 --- a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn +++ b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn @@ -1,6 +1,6 @@  - + DotNetNuke ClientAPI The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience. diff --git a/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn b/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn index 9941689522b..7cb0b36eae8 100644 --- a/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn +++ b/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn @@ -1,6 +1,6 @@  - + DNN Deprecated Website Codebehind files DNN Deprecated Website Codebehind files for backward compability. diff --git a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn index e918fffa407..35a182f456a 100644 --- a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn +++ b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn @@ -1,6 +1,6 @@ - + Message Center Core Messaging module allows users to message each other. ~/DesktopModules/CoreMessaging/Images/messaging_32X32.png diff --git a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn index 7002d520ded..f128ef27f46 100644 --- a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn +++ b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn @@ -1,6 +1,6 @@  - + DDR Menu DotNetNuke Navigation Provider. diff --git a/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn b/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn index 743451e74a2..0bee455ae60 100644 --- a/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn +++ b/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn @@ -1,6 +1,6 @@ - + Digital Asset Management DotNetNuke Corporation Digital Asset Management module Images/Files_32x32_Standard.png diff --git a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn index fb3fd24b05e..4c6c535154a 100644 --- a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn +++ b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn @@ -1,6 +1,6 @@ - + Site Export Import DotNetNuke Corporation Site Export Import Library Images/Files_32x32_Standard.png diff --git a/DNN Platform/Modules/Groups/SocialGroups.dnn b/DNN Platform/Modules/Groups/SocialGroups.dnn index 6e7e737ccae..1386e630e24 100644 --- a/DNN Platform/Modules/Groups/SocialGroups.dnn +++ b/DNN Platform/Modules/Groups/SocialGroups.dnn @@ -1,6 +1,6 @@ - + Social Groups DotNetNuke Corporation Social Groups module ~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png diff --git a/DNN Platform/Modules/HTML/dnn_HTML.dnn b/DNN Platform/Modules/HTML/dnn_HTML.dnn index 6c3d6c1fa33..11215452f72 100644 --- a/DNN Platform/Modules/HTML/dnn_HTML.dnn +++ b/DNN Platform/Modules/HTML/dnn_HTML.dnn @@ -1,6 +1,6 @@  - + HTML This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version. DesktopModules\HTML\Images\html.png diff --git a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn index 88a2fbd9d82..6ad9beceacb 100644 --- a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn +++ b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn @@ -1,6 +1,6 @@  - + Html Editor Management Images/HtmlEditorManager_Standard_32x32.png A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider. diff --git a/DNN Platform/Modules/Journal/Journal.dnn b/DNN Platform/Modules/Journal/Journal.dnn index e3221e6a694..cb85db9955c 100644 --- a/DNN Platform/Modules/Journal/Journal.dnn +++ b/DNN Platform/Modules/Journal/Journal.dnn @@ -1,6 +1,6 @@ - + Journal DotNetNuke Corporation Journal module DesktopModules/Journal/Images/journal_32X32.png diff --git a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn index cca6d1b0659..e15645583a2 100644 --- a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn +++ b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn @@ -1,6 +1,6 @@ - + Member Directory The Member Directory module displays a list of Members based on role, profile property or relationship. ~/DesktopModules/MemberDirectory/Images/member_list_32X32.png diff --git a/DNN Platform/Modules/RazorHost/Manifest.dnn b/DNN Platform/Modules/RazorHost/Manifest.dnn index 11072d5e669..1dfb437740e 100644 --- a/DNN Platform/Modules/RazorHost/Manifest.dnn +++ b/DNN Platform/Modules/RazorHost/Manifest.dnn @@ -1,6 +1,6 @@  - + {0} {1} diff --git a/DNN Platform/Modules/RazorHost/RazorHost.dnn b/DNN Platform/Modules/RazorHost/RazorHost.dnn index c4b3cdc5718..3f9e4ca00a8 100644 --- a/DNN Platform/Modules/RazorHost/RazorHost.dnn +++ b/DNN Platform/Modules/RazorHost/RazorHost.dnn @@ -1,6 +1,6 @@  - + Razor Host The Razor Host module allows developers to host Razor Scripts. diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json index e99e104b754..06db85c2670 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json @@ -1,6 +1,6 @@ { "name": "resource-library", - "version": "9.10.1", + "version": "9.10.2", "description": "Resource Library", "private": true, "scripts": { @@ -19,7 +19,7 @@ "@babel/plugin-transform-arrow-functions": "^7.10.4", "@babel/preset-env": "^7.2.0", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-eslint": "^10.1.0", "babel-loader": "8.0.6", "babel-plugin-transform-object-assign": "6.22.0", @@ -69,4 +69,4 @@ "superagent": "^3.2.1", "url-loader": "1.1.2" } -} +} \ No newline at end of file diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn index 5a8f60a4ad2..b0609eb9b09 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn @@ -1,6 +1,6 @@ - + Resource Manager This module allows you to manage files on the server ~/Images/icon_filemanager_32px.gif diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn index b0c9d35f4ce..e8d0349e8f3 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Facebook Authentication Project The DotNetNuke Facebook Authentication Project is an Authentication provider for DotNetNuke that uses Facebook authentication to authenticate users. diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn index 2556d777090..376593543f0 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Google Authentication Project The DotNetNuke Google Authentication Project is an Authentication provider for DotNetNuke that uses Google authentication to authenticate users. diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn index 602f6a383cf..a629ed90437 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Live Authentication Project The DotNetNuke Live Authentication Project is an Authentication provider for DotNetNuke that uses diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn index c3e169354cb..72122bafe1c 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Twitter Authentication Project The DotNetNuke Twitter Authentication Project is an Authentication provider for DotNetNuke that uses diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn index 2314703e9d8..13c46b114c5 100644 --- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn +++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn @@ -1,6 +1,6 @@  - + DotNetNuke Simple Web Farm Caching Provider DotNetNuke Simple Web Farm Caching Provider diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn index e21371ae06e..a725318c828 100644 --- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn +++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn @@ -1,6 +1,6 @@ - + DotNetNuke ASP.NET Client Capability Provider ASP.NET Device Detection / Client Capability Provider ~/Providers/ClientCapabilityProviders/AspNetClientCapabilityProvider/Images/mobiledevicedet_32X32.png diff --git a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn index 7c2e3d3ed4c..9aa641a7ef9 100644 --- a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn +++ b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn @@ -1,6 +1,6 @@  - + DotNetNuke Folder Providers Azure Folder Providers for DotNetNuke. diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn index cfa8c898cbc..5971283d272 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn @@ -1,5 +1,5 @@  - + DNN Connect CKEditor Provider CKEditor Provider by DNN Connect for DNN diff --git a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn index d724817c80e..b4e64b63c58 100644 --- a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn +++ b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn @@ -1,6 +1,6 @@ - + Xcillion @@ -29,7 +29,7 @@ - + Xcillion diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json index ea60231d6f4..3f0c53acc80 100644 --- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json @@ -1,6 +1,6 @@ { "name": "admin_logs", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -16,7 +16,7 @@ "@babel/plugin-transform-object-assign": "^7.0.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "2.0.4", "array.prototype.findindex": "2.0.2", "babel-loader": "8.0.6", @@ -55,4 +55,4 @@ "webpack-cli": "3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json index b5488969849..5786fb70a0d 100644 --- a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json @@ -1,6 +1,6 @@ { "name": "export-bundle", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p --progress", @@ -67,6 +67,6 @@ "webpack-dev-server": "3.1.14" }, "dependencies": { - "@dnnsoftware/dnn-react-common": "9.10.1" + "@dnnsoftware/dnn-react-common": "9.10.2" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json index e058a913dbb..7f5e72e5e76 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json @@ -1,6 +1,6 @@ { "name": "@dnnsoftware/dnn-react-common", - "version": "9.10.1", + "version": "9.10.2", "description": "DNN React Component Library", "main": "dist/dnn-react-common.min.js", "repository": { @@ -97,4 +97,4 @@ "react-dom": "^16.4.2", "react-hot-loader": "^4.8.5" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json index ea039be22ad..087a418f9f3 100644 --- a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json @@ -1,6 +1,6 @@ { "name": "extensions", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -13,7 +13,7 @@ "@babel/core": "^7.2.0", "@babel/preset-env": "^7.2.0", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-loader": "8.0.6", "babel-plugin-transform-object-assign": "6.22.0", "babel-plugin-transform-object-rest-spread": "6.26.0", @@ -40,4 +40,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json index 226accfc2ca..31ef98be1a6 100644 --- a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json @@ -1,6 +1,6 @@ { "name": "licensing", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -13,7 +13,7 @@ "@babel/core": "^7.1.6", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "2.0.4", "array.prototype.findindex": "2.0.2", "babel-loader": "8.0.6", @@ -42,4 +42,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json index d35045908f7..e1588faf860 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json @@ -1,6 +1,6 @@ { "name": "pages", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "start": "npm run webpack", @@ -24,7 +24,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.0.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "@types/knockout": "^3.4.66", "@types/redux": "3.6.31", "babel-eslint": "^10.0.1", @@ -74,4 +74,4 @@ "react-day-picker": "^7.2.4", "url-parse": "^1.2.0" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json index e90c21412a5..40e07bd2a5e 100644 --- a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json @@ -1,6 +1,6 @@ { "name": "prompt", - "version": "9.10.1", + "version": "9.10.2", "description": "DNN Prompt", "private": true, "scripts": { @@ -16,7 +16,7 @@ "@babel/core": "^7.1.6", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "2.0.4", "array.prototype.findindex": "2.0.2", "babel-eslint": "^10.0.1", @@ -76,4 +76,4 @@ "dependencies": { "html-react-parser": "^0.7.0" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json index 22478df1854..10073b606f4 100644 --- a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json @@ -1,6 +1,6 @@ { "name": "roles", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -14,7 +14,7 @@ "@babel/core": "^7.1.6", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "^2.0.0", "array.prototype.findindex": "^2.0.0", "babel-loader": "^8.0.6", @@ -51,4 +51,4 @@ "dependencies": { "react-widgets": "^4.4.6" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Security.Web/package.json b/Dnn.AdminExperience/ClientSide/Security.Web/package.json index b4a14988888..03a5ea0ed71 100644 --- a/Dnn.AdminExperience/ClientSide/Security.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Security.Web/package.json @@ -1,6 +1,6 @@ { "name": "security_settings", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -16,7 +16,7 @@ "@babel/plugin-transform-react-jsx": "^7.2.0", "@babel/preset-env": "^7.2.0", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-loader": "8.0.6", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "create-react-class": "^15.6.3", @@ -46,4 +46,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json index 056970d7ef6..7b31bb97c1f 100644 --- a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json @@ -1,6 +1,6 @@ { "name": "seo", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -15,7 +15,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "2.0.4", "array.prototype.findindex": "2.0.2", "babel-loader": "8.0.6", @@ -47,4 +47,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json index 4427118f38f..50467e82b1d 100644 --- a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json @@ -1,6 +1,6 @@ { "name": "servers", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -15,7 +15,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "@types/redux": "^3.6.31", "babel-loader": "8.0.6", "babel-plugin-transform-object-assign": "6.22.0", @@ -47,4 +47,4 @@ "dependencies": { "react-custom-scrollbars": "^4.1.1" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json index 3f261225fe3..56e2ca16dcb 100644 --- a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json @@ -1,6 +1,6 @@ { "name": "dnn-sitegroups", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -16,7 +16,7 @@ "@babel/plugin-transform-object-assign": "7.12.13", "@babel/preset-env": "7.1.6", "@babel/preset-react": "7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-loader": "8.0.6", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "babel-polyfill": "6.26.0", @@ -41,4 +41,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json index 1da44763b17..a047e08b181 100644 --- a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json @@ -1,6 +1,6 @@ { "name": "site_import_export", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -16,7 +16,7 @@ "@babel/plugin-transform-react-jsx": "^7.2.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-eslint": "^10.0.1", "babel-loader": "8.0.6", "babel-plugin-transform-class-properties": "^6.22.0", @@ -62,4 +62,4 @@ "dependencies": { "shortid": "^2.2.8" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json index 93f5716c5b6..9e9804b02b5 100644 --- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json @@ -1,6 +1,6 @@ { "name": "site_settings", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -18,7 +18,7 @@ "@babel/plugin-transform-react-jsx": "^7.2.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "2.0.4", "array.prototype.findindex": "2.0.2", "babel-loader": "^8.0.6", @@ -55,4 +55,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json index 1ea6f4ab43b..2d6a7fad5a7 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json @@ -1,6 +1,6 @@ { "name": "sites", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -16,7 +16,7 @@ "@babel/plugin-transform-object-assign": "7.12.13", "@babel/preset-env": "7.1.6", "@babel/preset-react": "7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-loader": "8.0.6", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "babel-polyfill": "6.26.0", @@ -41,4 +41,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json index 88449b0e8f1..0e778359361 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json @@ -1,6 +1,6 @@ { "name": "dnn-sites-list-view", - "version": "9.10.1", + "version": "9.10.2", "description": "DNN Sites List View", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", @@ -15,7 +15,7 @@ "@babel/plugin-transform-object-assign": "7.12.13", "@babel/preset-env": "7.1.6", "@babel/preset-react": "7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-loader": "8.0.4", "babel-plugin-transform-react-remove-prop-types": "0.4.20", "babel-polyfill": "6.26.0", @@ -40,4 +40,4 @@ "webpack-cli": "3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json index d9c7d808a6f..cea4b87bd4e 100644 --- a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json @@ -1,6 +1,6 @@ { "name": "task_scheduler", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -15,7 +15,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "2.0.4", "array.prototype.findindex": "2.0.2", "babel-loader": "8.0.6", @@ -47,4 +47,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json index 179c0e554a3..d942768e694 100644 --- a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json @@ -1,6 +1,6 @@ { "name": "themes", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -15,7 +15,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.2.0", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-loader": "8.0.6", "babel-plugin-transform-object-assign": "6.22.0", "babel-plugin-transform-object-rest-spread": "6.26.0", @@ -42,4 +42,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/package.json index 70fcaa17fc6..cc73e7a06a2 100644 --- a/Dnn.AdminExperience/ClientSide/Users.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Users.Web/package.json @@ -1,6 +1,6 @@ { "name": "users", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "start": "npm run webpack", @@ -52,8 +52,8 @@ "webpack-dev-server": "^3.1.14" }, "dependencies": { - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "localization": "^1.0.2", "react-widgets": "^4.4.6" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json index dd1fce1f3a4..c88327947f5 100644 --- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json @@ -1,6 +1,6 @@ { "name": "dnn-users-exportables", - "version": "9.10.1", + "version": "9.10.2", "description": "DNN Users Exportables", "scripts": { "start": "npm run webpack", @@ -17,7 +17,7 @@ "@babel/plugin-transform-react-jsx": "^7.1.6", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "babel-loader": "8.0.6", "create-react-class": "^15.6.3", "css-loader": "2.1.1", @@ -46,4 +46,4 @@ "webpack-cli": "3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json index 6ab478d67c3..9146baa0172 100644 --- a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json @@ -1,6 +1,6 @@ { "name": "taxonomy", - "version": "9.10.1", + "version": "9.10.2", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack -p", @@ -15,7 +15,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.1.6", "@babel/preset-react": "^7.0.0", - "@dnnsoftware/dnn-react-common": "9.10.1", + "@dnnsoftware/dnn-react-common": "9.10.2", "array.prototype.find": "2.0.4", "array.prototype.findindex": "2.0.2", "babel-loader": "^8.0.6", @@ -48,4 +48,4 @@ "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.14" } -} +} \ No newline at end of file diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn index df71ddc58ff..70598b4e88c 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn @@ -1,6 +1,6 @@ - + Dnn.PersonaBar.Extensions ~/Images/icon-personabarapp-32px.png diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn index 5056b4a080f..74c3379a84b 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn @@ -1,6 +1,6 @@ - + Dnn.EditBar.UI diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn index a1874aab746..74f9c745fcc 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn @@ -1,6 +1,6 @@ - + Dnn.PersonaBar.UI diff --git a/SolutionInfo.cs b/SolutionInfo.cs index 948e0fd37cc..ce8bd8a6f42 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -13,6 +13,6 @@ [assembly: AssemblyProduct("https://dnncommunity.org")] [assembly: AssemblyCopyright("DNN Platform is copyright 2002-2020 by .NET Foundation. All Rights Reserved.")] [assembly: AssemblyTrademark("DNN")] -[assembly: AssemblyVersion("9.10.1.0")] -[assembly: AssemblyFileVersion("9.10.1.0")] -[assembly: AssemblyInformationalVersion("9.10.1.0 Custom build")] +[assembly: AssemblyVersion("9.10.2.0")] +[assembly: AssemblyFileVersion("9.10.2.0")] +[assembly: AssemblyInformationalVersion("9.10.2.0 Custom build")] diff --git a/package.json b/package.json index 62b1c1d03b9..4ed59ad6f79 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dnn-platform", - "version": "9.10.1", + "version": "9.10.2", "private": true, "workspaces": [ "Dnn.AdminExperience/ClientSide/AdminLogs.Web", @@ -39,4 +39,4 @@ "test": "lerna run test" }, "packageManager": "yarn@3.0.2" -} +} \ No newline at end of file From 3955e96d344fc11de9cc5f28c65abe3b218815ef Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Tue, 12 Oct 2021 20:13:09 -0400 Subject: [PATCH 56/56] Resoldved an issue with redirect tabIds on non-localized sites This is a follow up on #4851 All my testing had been done on a localized site and after having those settings exist in the database. @david-poindexter just found out it was problematic on a clean install as those settings simply do not exists and the code failed getting those settings values from the dictionary of settings. This PR solves that. --- .../Services/SiteSettingsController.cs | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs index f59e7ef0963..5ba9d72314b 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs @@ -319,11 +319,11 @@ public HttpResponseMessage GetDefaultPagesSettings(int? portalId, string culture } var portal = PortalController.Instance.GetPortal(pid, cultureCode); - var localizedPortalSettings = PortalController.Instance.GetPortalSettings(portal.PortalID, cultureCode); + var localizedPortalSettings = PortalController.Instance.GetPortalSettings(pid, cultureCode); - int redirectAfterLoginTabId = int.TryParse(localizedPortalSettings["Redirect_AfterLogin"], out redirectAfterLoginTabId) ? redirectAfterLoginTabId : -1; - int redirectAfterLogoutTabId = int.TryParse(localizedPortalSettings["Redirect_AfterLogout"], out redirectAfterLogoutTabId) ? redirectAfterLogoutTabId : -1; - int redirectAfterRegistrationTabId = int.TryParse(localizedPortalSettings["Redirect_AfterRegistration"], out redirectAfterRegistrationTabId) ? redirectAfterRegistrationTabId : -1; + int redirectAfterLoginTabId = this.GetLocalizedTabIdSetting(localizedPortalSettings, "Redirect_AfterLogin"); + int redirectAfterLogoutTabId = this.GetLocalizedTabIdSetting(localizedPortalSettings, "Redirect_AfterLogout"); + int redirectAfterRegistrationTabId = this.GetLocalizedTabIdSetting(localizedPortalSettings, "Redirect_AfterRegistration"); return this.Request.CreateResponse(HttpStatusCode.OK, new { @@ -3582,5 +3582,17 @@ private int ValidateTabId(int tabId, int portalId) var tab = TabController.Instance.GetTab(tabId, portalId); return tab != null && !tab.IsDeleted ? tab.TabID : Null.NullInteger; } + + private int GetLocalizedTabIdSetting(Dictionary localizedPortalSettings, string settingKey) + { + var settingValue = string.Empty; + if (localizedPortalSettings.TryGetValue(settingKey, out settingValue)) + { + int tabId = int.TryParse(settingValue, out tabId) ? tabId : -1; + return tabId; + } + + return -1; + } } }