frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Nick O'Leary 2019-09-06 10:49:27 +01:00
commit d963dfdbb6
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -135,6 +135,11 @@ Nodes
- Add expand editor button to Template node - Add expand editor button to Template node
- Update catch/status nodes to use selectNodes api and treeList - Update catch/status nodes to use selectNodes api and treeList
#### 0.20.8: Maintenance Release
- Sanitize tab name in edit dialog
- Pass httpServer to runtime even when httpAdmin disabled Fixes #2272
#### 0.20.7: Maintenance Release #### 0.20.7: Maintenance Release
- Update jsonata to 1.6.5 which should fix #2183 - Update jsonata to 1.6.5 which should fix #2183

2
packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js vendored
View File

@ -70,7 +70,7 @@ RED.workspaces = (function() {
RED.view.state(RED.state.EDITING); RED.view.state(RED.state.EDITING);
var tabflowEditor; var tabflowEditor;
var trayOptions = { var trayOptions = {
title: RED._("workspace.editFlow",{name:workspace.label}), title: RED._("workspace.editFlow",{name:RED.utils.sanitize(workspace.label)}),
buttons: [ buttons: [
{ {
id: "node-dialog-delete", id: "node-dialog-delete",

2
packages/node_modules/node-red/lib/red.js vendored
View File

@ -76,7 +76,7 @@ module.exports = {
apiEnabled = true; apiEnabled = true;
server = httpServer; server = httpServer;
} else { } else {
runtime.init(userSettings); runtime.init(userSettings, httpServer);
apiEnabled = false; apiEnabled = false;
if (httpServer) { if (httpServer) {
server = httpServer; server = httpServer;