Merge branch 'dev' into pr_2463

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.3",
+    "version": "1.1.0",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,17 +31,17 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.0.3",
-        "@node-red/runtime": "1.0.3",
-        "@node-red/util": "1.0.3",
-        "@node-red/nodes": "1.0.3",
+        "@node-red/editor-api": "1.1.0",
+        "@node-red/runtime": "1.1.0",
+        "@node-red/util": "1.1.0",
+        "@node-red/nodes": "1.1.0",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
         "node-red-node-rbe": "^0.2.6",
         "node-red-node-tail": "^0.1.0",
-        "nopt": "4.0.1",
+        "nopt": "4.0.3",
         "semver": "6.3.0"
     },
     "optionalDependencies": {

packages/node_modules/node-red/settings.js

@@ -182,6 +182,17 @@ module.exports = {
     //    next();
     //},
 
+
+    // The following property can be used to add a custom middleware function
+    // in front of all admin http routes. For example, to set custom http
+    // headers
+    // httpAdminMiddleware: function(req,res,next) {
+    //    // Set the X-Frame-Options header to limit where the editor
+    //    // can be embedded
+    //    //res.set('X-Frame-Options', 'sameorigin');
+    //    next();
+    // },
+
     // The following property can be used to pass custom options to the Express.js
     // server used by Node-RED. For a full list of available options, refer
     // to http://expressjs.com/en/api.html#app.settings.table
@@ -243,7 +254,7 @@ module.exports = {
     // palette. If a node's category is not in the list, the category will get
     // added to the end of the palette.
     // If not set, the following default order is used:
-    //paletteCategories: ['subflows','flow','input','output','function','parser','social','mobile','storage','analysis','advanced'],
+    //paletteCategories: ['subflows', 'common', 'function', 'network', 'sequence', 'parser', 'storage'],
 
     // Configure the logging output
     logging: {