Merged changes after dnnsoftware#3456 got merged

valadas · Jan 11, 2020 · 724d249 · 724d249
2 parents 32861e2 + e0336cf
commit 724d249
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 11 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -42,7 +42,7 @@ Please add X in at least one of the boxes as appropriate. In order for an issue
 -->
 * [ ] 10.0.0 alpha build
 * [ ] 9.5.0 alpha build
-* [ ] 9.4.3 latest supported release
+* [ ] 9.4.4 latest supported release
 
 ## Affected browser
 <!-- 
@@ -51,5 +51,6 @@ Please add X in at least one of the boxes as appropriate. In order for an issue
 * [ ] Chrome
 * [ ] Firefox
 * [ ] Safari
-* [ ] Internet Explorer
-* [ ] Edge
+* [ ] Internet Explorer 11
+* [ ] Microsoft Edge (Classic)
+* [ ] Microsoft Edge Chromium
diff --git a/Build/BuildScripts/AEModule.build b/Build/BuildScripts/AEModule.build
@@ -46,6 +46,7 @@
     <Message Importance="high" Text="Running Yarn for $(WorkingDirectory)" />
 
     <Yarn Command="install" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
-    <Yarn Command="lerna run build --stream" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
+
+    <Yarn Command="build" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
   </Target>
 </Project>
diff --git a/DNN Platform/Library/Common/Utilities/UrlUtils.cs b/DNN Platform/Library/Common/Utilities/UrlUtils.cs
@@ -161,7 +161,8 @@ public static string[] GetQSParamsForNavigateURL()
         /// <returns>true if HTTPS or if HTTP with an SSL offload header value, false otherwise</returns>
         public static bool IsSecureConnectionOrSslOffload(HttpRequest request)
         {
-            return request.IsSecureConnection || IsSslOffloadEnabled(request);
+            var isSecureTab = PortalController.Instance.GetCurrentPortalSettings()?.ActiveTab.IsSecure ?? false;
+            return request.IsSecureConnection || (IsSslOffloadEnabled(request) && isSecureTab);
         }
 
         public static bool IsSslOffloadEnabled(HttpRequest request)

diff --git a/Dnn.AdminExperience/ClientSide/Bundle.Web/.eslintignore b/Dnn.AdminExperience/ClientSide/Bundle.Web/.eslintignore
@@ -1,4 +1,4 @@
 src/components/contentTypeModal/fieldDefinitions/FileUpload/Dropzone.jsx
 /src/vendor/**
 /src/utils/masker.js
-dnn-react-common.min.js
+*dnn-react-common.min.js
diff --git a/Dnn.AdminExperience/ClientSide/Bundle.Web/webpack.config.js b/Dnn.AdminExperience/ClientSide/Bundle.Web/webpack.config.js
@@ -34,7 +34,7 @@ module.exports = {
     resolve: {
         extensions: [".js", ".json", ".jsx"],
         modules: [
-            path.resolve("./node_modules"),
+            path.resolve("./node_modules"), // Try local node_modules
             path.resolve("../../../node_modules"),
             path.resolve(__dirname, "src")
         ]

diff --git a/...AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/Connectors.html b/...AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/Connectors.html
@@ -69,7 +69,7 @@ <h3 data-bind="html: $root.resx.title_Connections"></h3>
                                 <div class="number-connectors" data-bind="html: connections().length"></div>
                             </span>
                         </td>
-                        <td><span class="socialnetwork-name" data-bind="html: name"></span></td>
+                        <td><span class="socialnetwork-name" data-bind="html: displayName"></span></td>
                         <td>
                             <!-- ko if:  !isOpen() -->
                             <a class='primarybtn' data-bind="click: onOpen, html: $root.resx.btn_Edit"></a>

diff --git a/...xperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/scripts/Connectors.js b/...xperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/scripts/Connectors.js
@@ -362,7 +362,7 @@ define(['jquery', 'knockout', 'main/pager', 'main/validator', 'main/config', 'ma
                     newConfigurations[key] = "";
                 }
             });
-            var displayName = e === true ? item.name : getNewName(item);
+            var displayName = e === true ? item.displayName : getNewName(item);
             closeAllSubConnectors();
             var newConnection = Object.assign(connections[0].initialObject, { id: null, configurations: newConfigurations, displayName: displayName, open: true });
             var newConn = wrapConnection(newConnection);
@@ -377,9 +377,9 @@ define(['jquery', 'knockout', 'main/pager', 'main/validator', 'main/config', 'ma
         var getNewName = function (item) {
             var connections = item.connections();
             var index = connections.length;
-            var newName = item.name + " - " + index;
+            var newName = item.displayName + " - " + index;
             while (connections.some(function (conn) { return conn.displayName() === newName })) {
-                newName = item.name + " - " + ++index;
+                newName = item.displayName + " - " + ++index;
             }
             return newName;
         }
@@ -491,6 +491,7 @@ define(['jquery', 'knockout', 'main/pager', 'main/validator', 'main/config', 'ma
                     connections: ko.observable(_connections),
                     supportsMultiple: ko.observable(_connections[0].supportsMultiple),
                     name: _connections[0].name,
+                    displayName: _connections[0].displayName(),
                     isOpen: ko.observable(false),
                     height: ko.observable(0),
 

diff --git a/package.json b/package.json
@@ -26,5 +26,12 @@
   ],
   "devDependencies": {
     "lerna": "^3.16.4"
+  },
+  "scripts": {
+    "build": "lerna run build --stream",
+    "package": "lerna run package",
+    "clean": "lerna run clean",
+    "lint": "lerna run lint",
+    "test": "lerna run test"
   }
 }