Nick O'Leary
e50e2201b1
Merge pull request #3108 from sammachin/patch-2
...
change template characters
2021-10-04 10:57:04 +01:00
Nick O'Leary
1419729458
Merge pull request #3163 from node-red/notification-fixes
...
Allow RED.notify.update to modify any notification setting
2021-10-04 10:56:26 +01:00
Nick O'Leary
c14177b0e8
Merge pull request #3160 from node-red/filter-configs
...
Allow a node to specify a filter for the config nodes it can pick from
2021-10-04 10:56:16 +01:00
Nick O'Leary
126df969b3
Merge pull request #3157 from node-red/relabel-file-nodes
...
Add paletteLabel to file nodes to make read/write more obvious
2021-10-04 10:56:01 +01:00
Nick O'Leary
f8ee92ba06
Merge pull request #3158 from node-red/node-install-err-reporting
...
Improve node install error reporting
2021-10-04 10:55:47 +01:00
Nick O'Leary
81a278dd8c
Merge pull request #3156 from node-red/change-clone
...
Add option to deep-clone properties in Change node
2021-10-04 10:54:52 +01:00
Nick O'Leary
0171ffac6a
Fix sizing of HTTP Response header fields
2021-10-04 10:52:36 +01:00
Nick O'Leary
7544241316
Allow RED.notify.update to modify any notification setting
...
Fixes #3162
2021-10-04 10:31:46 +01:00
Nick O'Leary
061afb3a94
Improve RED.actions api to ensure actions cannot be overridden
...
Also alows multiple args to be passed to an action.
2021-10-02 23:26:01 +01:00
Nick O'Leary
8a5eda9c1f
Ensure type select button is not focussable when TypedInput only has one type
2021-10-02 23:25:56 +01:00
Nick O'Leary
f2e51779e4
Improve themeing of tourGuide
2021-10-02 23:15:35 +01:00
Nick O'Leary
da114fa3a5
Merge pull request #3152 from node-red/link-call
...
Add Link Call node
2021-10-01 15:59:43 +01:00
Nick O'Leary
3775a1657b
Merge pull request #3153 from node-red/update-monaco
...
Update monaco to 0.28.1
2021-10-01 15:59:16 +01:00
Nick O'Leary
253c489a33
Allow a node to specify a filter for the config nodes it can pick from
2021-09-30 19:44:34 +01:00
Nick O'Leary
ac84b6fe3f
Do better remembering TypedInput values whilst switching types
2021-09-30 18:14:45 +01:00
Nick O'Leary
8761e61439
Include load error in notification of unknown node
2021-09-30 15:39:45 +01:00
Nick O'Leary
29e903e1c8
Improve error reporting when installing bad nodes
2021-09-30 15:28:09 +01:00
Nick O'Leary
ec27e19e3f
Add unit tests for Join restartTimeout and update help
2021-09-30 10:59:45 +01:00
Nick O'Leary
5df0dae11a
Merge pull request #3121 from magma1447/dev
...
SPLIT Join node - support for msg.resetTimeout …
2021-09-30 10:45:42 +01:00
Nick O'Leary
7fffc1a36d
Merge pull request #3069 from node-red/delay-push-to-front
...
Add push to front of rate limit queue.
2021-09-30 10:44:14 +01:00
Nick O'Leary
f3d0179834
Add paletteLabel to file nodes to make read/write more obvious
2021-09-30 10:41:18 +01:00
Nick O'Leary
8bf69c598a
Ensure tab scroll handles are cleared when hide-all tabs run
2021-09-30 10:34:18 +01:00
Nick O'Leary
aa5fad6628
Add deep copy option to Change node 'set' action
2021-09-30 09:49:51 +01:00
Nick O'Leary
b0f1fad4e2
Change label for 'set' change node action to make it clearer
2021-09-29 19:43:30 +01:00
Nick O'Leary
0cbf4ac37d
Better regex for parsing config select width placeholder style
2021-09-29 19:12:13 +01:00
Nick O'Leary
9ccffee82c
Ensure config-node select inherits width properly from input
...
Fixes #3001
2021-09-29 19:06:34 +01:00
Nick O'Leary
1b38e2eedf
Merge pull request #3154 from node-red/fix-windows-themes
...
Fix serving of theme files on Windows
2021-09-29 18:00:41 +01:00
Nick O'Leary
ce87abe96e
Fix serving of theme files on Windows
...
Fixes #3097
2021-09-29 17:59:25 +01:00
Nick O'Leary
becbda8483
Update monaco types
2021-09-29 17:28:06 +01:00
Nick O'Leary
da210e2ae4
Ignore top-level await errs in monaco
...
Fixes #3138
2021-09-29 17:19:12 +01:00
Nick O'Leary
d4fc6feeba
Update to monaco 0.28.1
2021-09-29 17:17:34 +01:00
Nick O'Leary
f1cbca8d76
Add link-call help
2021-09-29 14:46:09 +01:00
Nick O'Leary
dfd9364061
Add timeout option to link-call node
2021-09-29 14:28:12 +01:00
Nick O'Leary
1931395fdb
Add basic link-call/return tests
2021-09-29 13:49:55 +01:00
Nick O'Leary
b01fd24e15
Add link-call node and add return mode for link-out node
2021-09-29 10:45:00 +01:00
Nick O'Leary
c9d1329fc2
Add 'radio' option to treeList
2021-09-29 10:44:09 +01:00
Nick O'Leary
ab2d3bfd80
Fix RED.nodes.filterNodes when searching full node set
2021-09-29 10:43:41 +01:00
Gerwin van Beek
01e64be39d
rename
2021-09-28 17:33:23 +02:00
Gerwin van Beek
4ebe160f6c
Restore tab selection after merging conflicts
2021-09-28 17:19:22 +02:00
Nick O'Leary
b427eca21f
Merge pull request #3136 from node-red/tour-guide-2
...
Add Tour Guide component
2021-09-27 17:59:05 +01:00
Nick O'Leary
3eb438c8d2
Merge pull request #3116 from node-red-hitachi/dev-httpreqlog
...
Extend HTTP request node to log detailed timing information
2021-09-27 17:56:34 +01:00
Nick O'Leary
068f425833
Merge pull request #3139 from node-red/fs-promises
...
Fixes to fs promises so that an electron built version runs
2021-09-27 17:51:10 +01:00
Nick O'Leary
b3c84242dc
Bump version for 2.1.0-beta.1
2021-09-27 17:50:09 +01:00
Nick O'Leary
24672d91d8
Fix linting error in tourGuide
2021-09-27 17:49:38 +01:00
Nick O'Leary
4422af26ec
Try to handle smaller screen sizes in tourGuide
2021-09-27 17:35:49 +01:00
Nick O'Leary
5329e803e2
Add keyboard handling to tourGuide - escape/enter
2021-09-27 17:35:24 +01:00
Nick O'Leary
ad542b91fa
Add i18n support to tours
2021-09-27 17:34:30 +01:00
Nick O'Leary
e9e03c945b
Add core:show-welcome-tour action and logic to display on first-run
2021-09-27 16:42:51 +01:00
Nick O'Leary
e20cfb3dae
Ignore dynamicImport warning from jshint
2021-09-26 20:46:43 +01:00
Nick O'Leary
48baac916c
Add initial tour-guide feature
2021-09-26 20:46:38 +01:00
Nick O'Leary
adadf38b08
Allow menu items to be opened via css class
2021-09-26 20:46:33 +01:00
Nick O'Leary
d4e1469450
Allow default tab to be specified when editing flows/groups/subflows
2021-09-26 20:46:28 +01:00
Nick O'Leary
2c456f044f
Allow popovers to be moved and styled
2021-09-26 20:46:23 +01:00
Nick O'Leary
228c15ace3
Fix icon position in dropdown menu
2021-09-26 20:38:55 +01:00
Nick O'Leary
a0d15e6e7b
Fix menu error for workspace tab button
2021-09-26 20:08:15 +01:00
Dave Conway-Jones
2fe78cf971
Update packages/node_modules/@node-red/util/lib/i18n.js
...
Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
2021-09-25 14:51:47 +01:00
Nick O'Leary
5ec3544340
Merge pull request #3148 from node-red/login-fixes
...
Improve error reporting with oauth login strategies
2021-09-24 22:40:15 +01:00
Nick O'Leary
5443a17775
Merge pull request #3120 from node-red/hide-flows
...
Allow tabs to be hidden
2021-09-24 22:39:42 +01:00
Nick O'Leary
40d60e4eb3
Add allowUpdate to settings file
2021-09-24 22:23:50 +01:00
Nick O'Leary
f3312a6403
Merge pull request #3143 from node-red/upgrade-deny-list
...
Add allowUpdate feature to externalModules.palette
2021-09-24 22:20:58 +01:00
Nick O'Leary
5caa76a8b3
Widden default menu to handle shortcuts
2021-09-24 22:15:02 +01:00
Nick O'Leary
901a5ce9d2
Better fade effect when hiding tabs
2021-09-24 22:10:53 +01:00
Nick O'Leary
6ab74951f4
Fix menu shortcut display when menu label is long
2021-09-24 19:44:05 +01:00
Nick O'Leary
c2625d696d
Merge branch 'dev' into hide-flows
2021-09-24 19:12:34 +01:00
Ben Hardill
77fb5ef2ab
Allow coreNodesDir to be set to false
...
This will disable all core nodes
2021-09-22 10:21:23 +01:00
Steve-Mcl
c20ca3399e
codeEditor.options should take precedence
...
- over plugins monacoOptions
2021-09-21 14:12:21 +01:00
Steve-Mcl
5825da9c76
Merge branch 'dev' into theme-monaco-theme
2021-09-21 14:06:54 +01:00
Nick O'Leary
e3853ae402
Improve error reporting with oauth login strategies
2021-09-20 11:48:51 +01:00
Renato Junior
bd142a9710
uncaughtException debug improvements
...
Changed error uncaughtException tracing
2021-09-17 22:02:48 -03:00
Dave Conway-Jones
4f23847546
Fix UDP node to not not use port if unassigned
2021-09-16 16:22:01 +01:00
Nick O'Leary
85820c571d
Add unit tests for allowUpdate settings
2021-09-14 10:50:26 +01:00
Nick O'Leary
d9bed03025
Add allowUpdate feature to externalModules.palette
2021-09-13 21:25:12 +01:00
Dave Conway-Jones
bbf066f030
Fixes to fs promises so that electron version runs
2021-09-10 08:33:07 +01:00
Casey Wilkes
a3d2f6592e
Add support for colouring tab icon in settings.js
...
```
editorTheme: {
page: {
tabicon: {
icon: "full/path/of/tabicon.svg",
colour: "#008f00"
}
}
```
The old way still works also (but doesn't allow the tabicon to
be coloured:
```
editorTheme: {
page: {
tabicon: "full/path/of/tabicon.svg"
}
}
```
2021-09-10 13:10:01 +12:00
Nick O'Leary
87b6327c5e
Merge branch 'dev' into hide-flows
2021-09-07 13:53:45 +01:00
Nick O'Leary
abaebb329d
Merge branch 'dev' into edit-panes-2
2021-09-07 13:42:49 +01:00
Nick O'Leary
9dc5ae21c4
Add menu options for raise/lower actions
2021-09-07 12:04:58 +01:00
Nick O'Leary
4132fb79a6
Allow nodes to be raised/lowered in the workspace
2021-09-07 11:49:31 +01:00
Nick O'Leary
9a4dc30604
Merge pull request #3110 from node-red/view-tools
...
Add align actions to editor
2021-09-07 11:49:10 +01:00
Nick O'Leary
192b542fe4
Add menu options for align tools and show shortcuts on menu
2021-09-07 11:47:04 +01:00
Kunihiko Toumura
490547cd3d
Use httpRequestTimingLog for enable detailed timing log
2021-09-05 15:22:13 +09:00
Dave Conway-Jones
17f9829498
Fix for incorrect tcpout connection count
...
to Close #3098
seems to need dummy data receiver in order to recognise other callbacks.
2021-09-03 13:00:06 +01:00
Nick O'Leary
234e77fd06
Rename registerEditPane function
2021-09-02 22:12:32 +01:00
Nick O'Leary
87ac831c8a
Simplify edit pane api
2021-09-02 21:59:30 +01:00
Nick O'Leary
4e92492165
Edit panes should not need to create own tray content div
2021-09-02 21:44:06 +01:00
Nick O'Leary
c3d0b1114f
Fix jshint error
2021-09-02 16:37:13 +01:00
Nick O'Leary
4463a7d4ba
Move envVar list component to own file
2021-09-02 16:14:35 +01:00
Nick O'Leary
741fe3dd90
Move tab edit dialog into editor and use new edit panes
2021-09-02 14:29:58 +01:00
Nick O'Leary
e910f3915d
Initial refactor of edit dialogs to separate panes
2021-09-02 10:33:43 +01:00
Nick O'Leary
39aafc5007
Ensure treeList row has suitable min-height when no content
...
Fixes #3109
2021-09-02 10:26:54 +01:00
Nick O'Leary
9b83afae42
Fix typo in ko editor.json
...
Fixes #3119
2021-09-02 10:26:49 +01:00
Mauricio Bonani
bdf54f6cff
Change fade color when hovering an inactive tab
2021-09-02 10:26:44 +01:00
Mauricio Bonani
f2a9887a12
Place close tab link in front of fade
2021-09-02 10:26:39 +01:00
bartbutenaers
4f4d78bfab
Key and certificate as string or buffer
2021-09-02 10:26:34 +01:00
Nick O'Leary
3b460fb8fa
Bump for 2.0.6
2021-09-02 09:00:54 +01:00
Nick O'Leary
ee15e9acc5
Update tar to latest
2021-09-02 08:21:10 +01:00
Amit Kumar Swami
78899378c2
Update tar to 6.1.9 to resolve vulnerability issue
2021-09-02 13:36:41 +08:00
Hiroyasu Nishiyama
67404a327d
merge getFlowSetting to getSetting
2021-09-01 22:26:31 +09:00
Sam Machin
702dfa4b79
Update packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
...
Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
2021-08-31 16:59:32 +01:00
Nick O'Leary
2144407e41
Merge pull request #3117 from dschmidt/passport-callback-arity
...
Give passport verfiy callback wrapper the same arity as the original callback
2021-08-31 16:45:43 +01:00
Nick O'Leary
b36dd62c50
Remove console.log
2021-08-31 15:23:50 +01:00
Nick O'Leary
7026df7d96
Track hidden tabs in localStorage
2021-08-31 15:19:04 +01:00
Nick O'Leary
ed8e7afdf6
Add flow tab bar menu
2021-08-31 14:46:11 +01:00
Hiroyasu Nishiyama
d78e5932f9
update according to PR comments
2021-08-30 08:00:58 +09:00
Nick O'Leary
26d83bb9ea
Ensure treeList row has suitable min-height when no content
...
Fixes #3109
2021-08-27 16:32:43 +01:00
Nick O'Leary
8e89b1bdf2
Fix typo in ko editor.json
...
Fixes #3119
2021-08-27 16:22:58 +01:00
Nick O'Leary
c880cc0987
Add core:hide-other-tabs and handle multiple tab selection
2021-08-27 11:46:30 +01:00
Nick O'Leary
0874ba7a03
Add core:show-last-hidden-tab and update keymap
2021-08-26 22:20:25 +01:00
Nick O'Leary
7962278475
Allow tabs to be hidden via x-button on tab
2021-08-26 12:06:35 +01:00
Nick O'Leary
c8949f5eeb
Fix treeList gutter padding for outliner
2021-08-26 12:06:30 +01:00
Nick O'Leary
8108b93c5f
Add core:toggle-tabs action
2021-08-26 12:06:25 +01:00
Nick O'Leary
9dbe531bf7
Remove duplicate hide-tab action
2021-08-26 12:06:20 +01:00
Nick O'Leary
46e2ff1001
Allow tabs to be hidden
2021-08-26 12:06:15 +01:00
Nick O'Leary
d2cdc67ec7
Add distribute-horizontally/vertically actions to editor
2021-08-26 12:05:56 +01:00
Nick O'Leary
56121203bf
Rename align actions to match existing align-selection-to-grid
2021-08-26 12:05:51 +01:00
Nick O'Leary
e13133fd2b
Add align actions to editor
2021-08-26 12:05:45 +01:00
Magnus Månsson
f20565fd16
Renamed resetTimeout to restartTimeout
...
Updated documentation differently
2021-08-25 21:53:37 +02:00
Magnus Månsson
cf2d5841f5
SPLIT Join node - support for payload.resetTimeout to restore original timeout
2021-08-25 12:52:10 +02:00
Dominik Schmidt
630d2ca926
Give passport verfiy callback wrapper the same arity as the original callback passed in via options
2021-08-23 15:57:44 +02:00
Nick O'Leary
34cb93794c
Merge pull request #3106 from bonanitech/fade-on-hover
...
Fix fade colors when hovering over tabs
2021-08-23 12:34:42 +01:00
Kunihiko Toumura
401466d6c0
Add timing log
2021-08-23 11:54:05 +09:00
bartbutenaers
7f2627dbc8
Key and certificate as string or buffer
2021-08-21 22:21:58 +02:00
Hiroyasu Nishiyama
6aecc3915c
add support of environtment variable for tab & group
2021-08-19 21:15:13 +09:00
Dave Conway-Jones
ef1b3aa7f5
Add comment to info docs re queue depth limit setting
2021-08-18 14:05:42 +01:00
Sam Machin
1aaab2a814
change template characters
...
Added note about changing template characters
2021-08-12 16:41:32 +01:00
Mauricio Bonani
e93734b209
Change fade color when hovering an inactive tab
2021-08-10 14:26:41 -04:00
Mauricio Bonani
9e5218f6b4
Place close tab link in front of fade
2021-08-10 14:21:54 -04:00
Ben Hardill
711ec39327
Fix editor-client package.json
...
The main entry pointed to non-existant entry.
Also fixed error when loading nodes lazily
2021-08-06 21:16:34 +01:00
Steve-Mcl
08049252f2
permit plugin theme to change other monaco options
2021-07-31 10:24:48 +01:00
Nick O'Leary
f1e7ec0c6b
Bump for 2.0.5
2021-07-30 13:28:52 +01:00
Nick O'Leary
23765d9139
Update tar dependency
2021-07-30 13:20:26 +01:00
Nick O'Leary
40233c7702
Fix regression in Join node when manual joining array with msg.parts present
...
Fixes #3096
2021-07-30 13:17:05 +01:00
Nick O'Leary
27ed81614b
Remove default ctrl-enter keybinding from monaco editor
...
Fixes #3093
2021-07-30 11:50:21 +01:00
Nick O'Leary
f8571023f6
Fix inject now button unable to send empty props
2021-07-28 10:59:16 +01:00
Nick O'Leary
6364e00202
Merge pull request #3092 from hardillb/http-req-ca-fix
...
Copy tls.cert to tls.certificate for GOT
2021-07-28 10:05:19 +01:00
Ben Hardill
a76c6f86c6
Add Testcase & Fix typo
2021-07-28 08:52:35 +01:00
Ben Hardill
555e815402
Copy tls.cert to tls.certificate for GOT
2021-07-27 22:19:35 +01:00
Steve-Mcl
8a1d81989b
use codeEditor.options.theme
2021-07-26 21:02:11 +01:00
Nick O'Leary
ee9234b2c6
Bump for 2.0.4
2021-07-26 17:09:26 +01:00
Nick O'Leary
735b9c5844
Handle just-copied-but-not-deployed node with credentials in editor
...
Fixes #3090
2021-07-26 14:50:00 +01:00
Nick O'Leary
064f3eb3bc
Fix RBE node handling of default topi property
...
Fixes #3087
2021-07-26 14:36:09 +01:00
Nick O'Leary
f1775d4fd1
Handle partially encoded url query strings in request node
2021-07-26 14:21:52 +01:00
Nick O'Leary
a9bc111c4f
Merge pull request #3089 from hardillb/http-req-ca-fix
...
Fix support for supplied CA certs
2021-07-26 14:20:08 +01:00
Ben Hardill
26087f8dc7
Fix support for supplied CA certs
2021-07-26 10:25:06 +01:00
Mauricio Bonani
36e75cb728
Fix tab fade CSS for when using themes
2021-07-25 11:08:55 -04:00
Steve-Mcl
d7a2fc2be4
use them plugin theme monacoTheme if present
2021-07-25 15:16:49 +01:00
Nick O'Leary
142176f194
Bump for 2.0.3
2021-07-23 14:38:43 +01:00
Nick O'Leary
c5892fc17e
Fix HTML parsing when body is included in the select tag
...
Fixes #3079
2021-07-23 10:09:00 +01:00
Nick O'Leary
6e69cfbca4
Preserve case of user-provided http headers in request node
...
Fixes #3081
2021-07-23 09:55:32 +01:00
Nick O'Leary
775181f761
Set decompress to false for HTTP Request to keep 1.x compatibility
...
Fixes #3083
2021-07-23 08:57:44 +01:00
Nick O'Leary
5f6fcb2bc0
Do not throw HTTP errors in request node
...
Fixes #3082
GOT will throw errors for non-successful http responses by default. We need to turn that
off to be consistent with the 1.x behaviour using the request module
2021-07-22 23:48:30 +01:00
Nick O'Leary
7b106e5650
Ensure uri is properly encoded before passing to got module
...
Fixes #3080
2021-07-22 23:47:32 +01:00
Nick O'Leary
79d9c83a2d
Better detection of broken agent-base function patching
2021-07-22 11:19:25 +01:00
Nick O'Leary
269669ba28
Bump for 2.0.2
2021-07-22 11:17:48 +01:00
Nick O'Leary
4ef7240598
Handle other error types in Manage Palette view
...
We still get [object Object] appearing in the palette manager sometimes.
This fix nails down another cause - where the err property has a 'code'
but no 'message' property. This happens with the type_already_registered
error
2021-07-21 17:26:19 +01:00
Nick O'Leary
f7606e92ca
Detect if agent-base has patch https.request and undo it
...
Fixes #3072
2021-07-21 16:22:28 +01:00
Nick O'Leary
6750be3ec9
HTTP Request node - ignore invalid cookies rather than fail request
...
Fixes #3075
Keeps behaviour consistent with the request module
2021-07-21 14:09:15 +01:00
Nick O'Leary
68fb5089f8
Fix msg.reset handling in Delay node
...
Fixes #3074
2021-07-21 11:32:45 +01:00
Nick O'Leary
a8d093bacd
Use file:// url with dynamic import
2021-07-21 11:00:24 +01:00
Nick O'Leary
233a1995b3
Fix tab fade css because Safari
...
Fixes #3073
2021-07-21 10:26:06 +01:00
Nick O'Leary
8ef3baaffb
Fix error closing library dialog with monaco
2021-07-21 10:10:07 +01:00
Nick O'Leary
c9597b9447
Bump for 2.0.1
2021-07-20 14:44:47 +01:00
Nick O'Leary
b2dc1d8b23
Ensure default module export is exposed in Function node
2021-07-20 14:42:43 +01:00
Nick O'Leary
859c0c7f6c
Update to latest node-red-admin
2021-07-20 11:19:13 +01:00
Nick O'Leary
dc603b76a4
Fix focus outline overlap in button-groups
...
Fixes #3070
2021-07-20 11:02:24 +01:00
Dave Conway-Jones
a2b95dbb39
delay node - change lifo property to toFront
...
add info to sidebar
add tests
2021-07-16 11:31:21 +01:00
Nick O'Leary
ed09cd7489
Merge pull request #3068 from hardillb/http-auth-fix
...
Fix for #3067
2021-07-16 09:47:57 +01:00
Nick O'Leary
eb3330d145
Fix vertical sizing of function node edit dialog
2021-07-16 09:44:56 +01:00
Nick O'Leary
5ba0588c7b
Merge branch 'master' into dev
2021-07-16 08:53:35 +01:00
Nick O'Leary
d4a199f0e1
Avoid prototype pollution in RED.view.calculateTextDimensions
2021-07-16 08:52:00 +01:00
Ben Hardill
32dd186f4d
Prevent Overwite of configured creds
2021-07-16 08:47:30 +01:00
Dave Conway-Jones
d820f55358
Add push to front of rate limit queue.
...
(moved random delay to top to group with other delay types.
Tests and docs to follow
2021-07-15 22:15:46 +01:00
Ben Hardill
81f0fb3c74
Fix creds in URL
2021-07-15 18:32:51 +01:00
Ben Hardill
972c83cd52
Fix for #3067
...
Check if there are any content to the credential object
2021-07-15 17:35:03 +01:00
Nick O'Leary
66a704af55
Fallback to 'require' if on node < 12.17
2021-07-15 15:38:07 +01:00
Hiroyasu Nishiyama
c1d85f760d
update Japanese message catalogue
2021-07-15 21:09:20 +09:00
Nick O'Leary
2cc1973f62
Enable functionExternalModules by default
2021-07-15 10:07:52 +01:00
Nick O'Leary
eb4625a0b9
Merge pull request #3064 from node-red/revert-external-modules-dir
...
Move externalModules back into the user dir
2021-07-15 09:56:23 +01:00
Nick O'Leary
ddb715d88d
Record runtime-installed modules in .config.modules.json
2021-07-14 23:13:52 +01:00
Nick O'Leary
395b499856
Fix async loading of modules in function node
2021-07-14 21:10:59 +01:00
Nick O'Leary
cce6a47f11
Rework function module screen
2021-07-14 20:23:01 +01:00
Nick O'Leary
7fd17b4ec0
Add RED.import to support importing ES6 modules
2021-07-14 19:18:39 +01:00
Nick O'Leary
e16ab2a0fd
Bump for 2.0.0
2021-07-13 11:51:23 +01:00
Nick O'Leary
c7c595e5fa
Merge pull request #3063 from kazuhitoyokoi/dev-addjpn
...
Add Japanese translations for Node-RED v2.0
2021-07-13 11:37:23 +01:00
Nick O'Leary
5b24e8b69c
Merge pull request #3059 from node-red/delay-queue
...
Delay node updates to added numeric flush control for releasing things from queue
2021-07-13 11:37:13 +01:00
Nick O'Leary
e6a845e606
Move externalModules back into the user dir
2021-07-13 11:24:10 +01:00
Kazuhito Yokoi
ec8b8a7b87
Change translation to be same as other usages
2021-07-13 14:15:37 +09:00
Kazuhito Yokoi
51a9205105
Add Japanese translations for Node-RED v2.0
2021-07-13 14:05:44 +09:00
Nick O'Leary
ed5567fc73
Merge pull request #3056 from node-red/ws-ping
...
Allow websocket client node to send pings
2021-07-12 19:40:57 +01:00
Nick O'Leary
b01c5a05e7
Fix reporting of type_already_registered error
2021-07-12 16:09:25 +01:00
Nick O'Leary
36eddabc1c
Ensure node.types is defined if node html file missing
2021-07-12 16:09:02 +01:00
Nick O'Leary
e7efa76e6d
Add a slight fade to tab labels that overflow
2021-07-08 12:23:15 +01:00
Dave Conway-Jones
41c8ca8ab4
Delay node updates to added flush control for queuing
2021-07-08 12:13:23 +01:00
Nick O'Leary
4624079be7
Merge pull request #3057 from kazuhitoyokoi/dev-fixdependencies
...
Add necessary modules and remove unnecessary module in dependencies
2021-07-08 12:07:07 +01:00
Nick O'Leary
c6f6042271
Show config node details when selected in outliner
2021-07-08 12:03:20 +01:00
Nick O'Leary
e9e3b9b7c6
Fix layout of info outliner for subflow entries
2021-07-08 12:02:11 +01:00
Kazuhito Yokoi
becbb09a29
Add necessary modules and remove unnecessary module in dependencies
2021-07-08 19:50:26 +09:00
Kazuhito Yokoi
6f6ab50995
Add necessary modules and remove unnecessary module in dependencies
2021-07-08 19:14:53 +09:00
Nick O'Leary
d8ee766860
Allow websocket client node to send pings
2021-07-08 10:51:36 +01:00
Nick O'Leary
108c26d8af
Merge pull request #3055 from bonanitech/grip-horizontal
...
Fix grip on panels separator
2021-07-08 08:41:48 +01:00
Nick O'Leary
ed8d3088ca
Merge pull request #3054 from bonanitech/scriptFiles
...
Fix scriptFiles
2021-07-08 08:41:18 +01:00
Nick O'Leary
7448ad109e
Add missing dependency to @node-red/utils module
2021-07-08 08:39:20 +01:00
Mauricio Bonani
6211dfe024
Fix grip on horizontally displayed panels separator
2021-07-07 09:52:47 -04:00
Mauricio Bonani
9b85200954
Fix grip on panels separator
2021-07-07 09:24:14 -04:00
Mauricio Bonani
94ee739d91
Fix scriptFiles
2021-07-07 09:12:58 -04:00
Kazuhito Yokoi
e81a6db9a3
Add fs-extra module to dependencies in @node-red/util module
2021-07-05 13:34:56 +09:00
Nick O'Leary
66dd05f8bc
Merge branch 'master' into dev
2021-07-02 10:01:07 +01:00
Nick O'Leary
19589d9117
Merge branch 'master' into dev
2021-07-02 10:00:43 +01:00
Nick O'Leary
be22f8cd14
Update js-yaml
2021-07-02 09:39:19 +01:00
Nick O'Leary
868be9b7ff
Update node-red-admin to 2.1
2021-07-02 09:37:14 +01:00
Nick O'Leary
5011281104
Merge branch 'dev' of github.com:node-red/node-red into dev
2021-07-02 09:22:56 +01:00
Nick O'Leary
42992c64ec
Merge branch 'pr_3026' into dev
2021-07-02 09:22:35 +01:00
Nick O'Leary
2baff243ed
Rename exec node hideWin option
2021-07-02 09:22:08 +01:00
Nick O'Leary
83440a6b0f
Merge pull request #3047 from node-red/config-outliner-fix
...
Emit `nodes:change` for any updated config node when node deleted/added
2021-07-02 08:47:46 +01:00
Nick O'Leary
87c9a1c06c
Include hasUser=false config nodes when exporting whole flow ( #3048 )
2021-07-01 21:40:57 +01:00
Nick O'Leary
b848fe249f
Remove stray console.log from mqtt.html
2021-07-01 21:01:11 +01:00
Nick O'Leary
1e804d97ce
Fix padding of compact notification
...
Closes #3045
2021-07-01 20:57:42 +01:00
Nick O'Leary
218d3c144b
Emit nodes:change for any updated config node when node deleted/added
2021-07-01 20:52:13 +01:00
Nick O'Leary
05a4905490
Fix padding of compact notification
...
Closes #3045
2021-07-01 17:23:52 +01:00
Ben Hardill
9db9b53c81
Fix package.json
...
Also back out auth changes
2021-06-30 14:12:20 +01:00
Ben Hardill
0e4787f3e8
Bump hpagent to 0.1.2
...
Also remove workaround for empty proxy credentials
2021-06-30 13:42:56 +01:00
Nick O'Leary
f8d8d4b186
Update dependencies
2021-06-29 16:19:28 +01:00
Nick O'Leary
2ce0e38827
Merge pull request #3040 from node-red/map-set-debug
...
Add support for Map/Set property types on Debug
2021-06-29 14:08:29 +01:00
Nick O'Leary
5b980e8c13
Merge pull request #3032 from node-red/view-annotations
...
Add RED.view.annotations api
2021-06-29 14:08:08 +01:00
Nick O'Leary
21b602650c
Merge branch 'dev' of github.com:node-red/node-red into dev
2021-06-29 14:01:12 +01:00
Nick O'Leary
fa4b7a1a69
Ensure any html in changelog is escaped before displaying
2021-06-29 13:58:24 +01:00
Nick O'Leary
48ac50e1c9
Add support for Map/Set property types on Debug
2021-06-29 11:09:30 +01:00
Kazuhito Yokoi
be64603097
Fix indents from tab to space
2021-06-29 18:08:02 +09:00
Kazuhito Yokoi
f6b90c8271
Fix output label in file-in node
2021-06-29 18:02:06 +09:00
Kazuhito Yokoi
26e4be87c7
Add Japanese translation for file-in node ( #3037 )
2021-06-29 08:42:16 +01:00
Nick O'Leary
cddbb8d80d
Merge pull request #3035 from node-red/file-node-msg-clone-option
...
Add option for file-in node to include all properties (default off)
2021-06-28 15:48:12 +01:00
Nick O'Leary
58023b4bf0
Merge branch 'pr_3024' into dev
2021-06-28 15:32:32 +01:00
Nick O'Leary
4f18a5f1c3
Merge pull request #3025 from node-red/comms-batch
...
Batch messages sent over Comms link
2021-06-28 15:28:40 +01:00
Nick O'Leary
56df8d8bd3
Merge pull request #3031 from Steve-Mcl/monaco0252
...
Update Monaco Editor to V0.25.2 (latest)
2021-06-28 15:28:09 +01:00
Nick O'Leary
211ec104c2
Merge pull request #3015 from Steve-Mcl/monaco-beta-bug-fix
...
Patches for Monaco editor
2021-06-28 15:27:27 +01:00
Nick O'Leary
3fb573247d
Add 'theme' to default settings file
2021-06-25 18:10:13 +01:00
Dave Conway-Jones
6aac44db14
Add option for file-in node to include all properties (default off)
...
and add test
2021-06-25 14:39:18 +01:00
Nick O'Leary
3255e11cfc
Limit annotations to badge type
2021-06-24 17:59:32 +01:00
Nick O'Leary
844bf29de1
Add RED.view.annotations api
2021-06-24 17:40:26 +01:00
Steve-Mcl
04d91d1422
prevent promise rejection when loading editor
2021-06-24 11:28:39 +01:00
Steve-Mcl
db90e1f801
remove unnecessary global uncaught promise handler
...
- monaco issue https://github.com/microsoft/monaco-editor/issues/2382
2021-06-24 11:27:24 +01:00
Steve-Mcl
7f30748a41
dont try to load en-gb or en-us (they're builtin)
...
- also monaco now comes with Turkish, Polish, Portuguese, Czech langs
2021-06-24 11:25:26 +01:00
Steve-Mcl
a4e0abb48f
Update monaco editor to V0.5.2
2021-06-24 11:21:49 +01:00
Steve-Mcl
3f27dc89d8
Add overloads for context/flow/global set/get/keys
2021-06-23 22:27:13 +01:00
Nick O'Leary
d6f6efc189
Lower tray zIndex when overlay tray being opened
...
Fixes #3019
2021-06-23 14:34:52 +01:00
Nick O'Leary
2cda49fc38
Reduce z-Index of Function expand buttons to prevent overlap
...
Part of #3019
2021-06-23 14:16:36 +01:00
Nathanaël Lécaudé
04f4a76b41
exec node: clarify scope
2021-06-18 14:46:16 -04:00
Steve-Mcl
0a8f7085f3
allow static private field to have initializer
2021-06-17 08:44:44 +01:00
Steve-Mcl
c908502644
add 2 ace compatible functions
...
- clearSelection - blocky node
- selectAll - obvious addition
2021-06-16 22:36:00 +01:00
Nathanaël Lécaudé
2f0631809d
exec node: modify test
2021-06-16 17:09:21 -04:00
Nathanaël Lécaudé
91ab3bd972
exec node: add windowsHide option to hide windows under Windows
2021-06-16 17:00:00 -04:00
Sam Machin
672636313c
Update packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
...
Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
2021-06-16 17:13:52 +01:00
Nick O'Leary
79875ef50d
Merge branch 'master' into dev
2021-06-16 17:03:50 +01:00
Nick O'Leary
aea5445495
Support loading external module sub path
...
Fixes #3023
2021-06-16 17:02:24 +01:00
Nick O'Leary
754a36fbc9
Merge branch 'master' into dev
2021-06-16 13:42:56 +01:00
Nick O'Leary
85dafc0b3c
Ensure RED.clipboard.import displays the right library
...
Fixes #3021
2021-06-16 13:41:58 +01:00
Nick O'Leary
b516ab9b4f
Batch messages sent over comms to prevent flooding
2021-06-16 11:45:02 +01:00
Nick O'Leary
1a27e60e55
Allow RED.popover.panel to specify a closeButton to ignore click events on
2021-06-16 11:44:40 +01:00
Nick O'Leary
2c710736e8
Use browser default language for initial page load
2021-06-16 11:44:35 +01:00
Nick O'Leary
69b9ff69be
Add css var for node font color
2021-06-16 11:44:30 +01:00
Nick O'Leary
a3a4fc0cc2
Fix label padding of toggleButton
2021-06-16 11:44:25 +01:00
Nick O'Leary
ae686bb15d
Give sidebar open tab a bit more room for its label
2021-06-16 11:44:20 +01:00
Nick O'Leary
68a5325849
Bump version to 2.0.0-beta.2
2021-06-16 11:44:14 +01:00
Nick O'Leary
75e3bddfa9
Remove the request module as a dependency
2021-06-16 11:44:09 +01:00
Sam Machin
bd3a8db438
log readOnly on startup
2021-06-16 10:10:31 +01:00
Steve-Mcl
1a73a27102
add diagnosticCodesToIgnore 2345
...
- handles issue with Intl.DateTimeFormat when `options` is a variable
2021-06-15 23:15:54 +01:00
Steve-Mcl
a9cf34ab56
prevent IE script error
...
- even though monaco does not work in EI, scripts must not fail to load
2021-06-15 21:02:30 +01:00
Steve-Mcl
46d17c3314
update code comments
2021-06-15 21:01:33 +01:00
Kazuhito Yokoi
13f1c12912
Add translations to message catalog
2021-06-14 15:54:05 +09:00
Hiroyasu Nishiyama
93c25f5d1b
Update message catalogue
2021-06-13 14:19:36 +09:00
Steve-Mcl
aa6ec60c34
fix up issues with function node types
...
- node.status add overload
- remove examples as they dont render correctly
- correct Number and Object types to number and object
2021-06-11 18:44:37 +01:00
Ben Hardill
919aee64f9
Add support for user/pass in URL
2021-06-11 14:48:41 +01:00
Ben Hardill
bcb6d1cf93
Fix for basic auth with @ in username
2021-06-11 14:25:18 +01:00
Steve-Mcl
7d24e5b279
node.status snippet enums for fill and shape
2021-06-11 08:01:38 +01:00
Steve-Mcl
12253e23b5
Add setReadOnly support
2021-06-10 21:18:29 +01:00
Nick O'Leary
4acb66fb7a
Merge branch 'master' into dev
2021-06-10 16:06:30 +01:00
Dave Conway-Jones
b73efe6bb4
Ensure CSV node tries to parse number when set to do so (trim whitespace)
2021-06-10 14:55:47 +01:00
Nick O'Leary
89c84522d2
Merge branch 'master' into dev
2021-06-10 14:19:24 +01:00
Nick O'Leary
98172764ac
Handle node icon paths for scoped modules
...
Fixes #3013
2021-06-10 14:15:43 +01:00
Nick O'Leary
448e881104
Update to latest node-red-admin
2021-06-10 10:31:54 +01:00
Nick O'Leary
133df75bd4
Merge branch 'dev' into get-got
2021-06-09 09:59:23 +01:00
Nick O'Leary
440be0653a
Merge pull request #3012 from node-red/reorganise-settings
...
Restructure default settings.js to be more organised
2021-06-09 09:57:34 +01:00
Nick O'Leary
d721a40ca5
Clarify flowFilePretty option
2021-06-09 09:26:55 +01:00
Nick O'Leary
a9b252b8fa
Ensure httpServerOptions gets applied to ALL the express apps
...
This is silly. Turns out setting options at a top level app
does not percolate down to sub apps (and vice versa). You
have to apply the options to ALL express apps.
2021-06-08 21:17:42 +01:00
Nick O'Leary
8a5b3ddee7
Change comment style in default settings file.
...
Makes clearer what is a comment and what is commented-out code.
2021-06-08 21:04:59 +01:00
Nick O'Leary
d83e543a98
Update dependencies
2021-06-08 17:33:40 +01:00
Nick O'Leary
bcd6e8fd63
Restructure default settings.js to be more organised
2021-06-08 15:58:19 +01:00
Ben Hardill
d5c5738aab
Fix proxy authentication problem & reinstate tests
...
Down to only 2 of the previous tests not working
2021-06-08 14:22:20 +01:00
Nick O'Leary
ff5e038c49
Improve contrast of export dialog JSON font color
2021-06-08 11:54:58 +01:00
Nick O'Leary
ce905ba2c4
Merge branch 'master' into dev
2021-06-08 11:44:31 +01:00
Nick O'Leary
3104c17fb3
Update to latest node-red-admin
2021-06-08 11:36:16 +01:00
Nick O'Leary
7651941722
Do not assign z property to tab node when updating flow
...
Fixes #3010
2021-06-08 11:35:43 +01:00
Nick O'Leary
7bf938901a
Merge branch 'pr_2952' into dev
2021-06-08 11:09:56 +01:00
Nick O'Leary
f8b61d2926
Merge pull request #2997 from hardillb/watch-fix
...
Watch node throws errors if new files deleted
2021-06-08 11:07:37 +01:00
Nick O'Leary
4edea59ab1
Merge branch 'pr_2990' into dev
2021-06-08 10:56:57 +01:00
Nick O'Leary
c8bcd2818d
Disable inject-now button if inside subflow
2021-06-08 10:56:34 +01:00
Nick O'Leary
9b46dbaff1
Switch editableList buttons from <a> to <button> elements
2021-06-08 10:56:04 +01:00
Nick O'Leary
bd00c728d1
Merge pull request #3008 from Steve-Mcl/node-red-typings-update
...
Node red typings update
2021-06-08 10:29:03 +01:00
Nick O'Leary
9d510b514c
Merge pull request #3007 from Steve-Mcl/monaco-update
...
update monaco v0.24.0
2021-06-08 10:27:15 +01:00
Nick O'Leary
dbbdd3f799
Update to latest cheerio module
2021-06-08 09:31:27 +01:00
Nick O'Leary
3541b4b968
Merge pull request #3004 from node-red-hitachi/fix-get-subflow-info
...
Fix allow Flow.getNode to return subflowInstance nodes
2021-06-07 18:16:01 +01:00
Nick O'Leary
5b1bf35a23
Fix over-greeding matching whilst parsing commit history
...
Fixes #3006
2021-06-07 18:07:58 +01:00
Steve-Mcl
714a5e26b3
add env.get to function node defs
2021-06-05 12:42:54 +01:00
Steve-Mcl
7f2c6e40d3
fix typescript errors in node-red d.ts def files
2021-06-05 12:42:13 +01:00
Steve-Mcl
db676ec223
add snippet for env.get
2021-06-05 12:34:47 +01:00
Steve-Mcl
ffb3e511a7
update monaco v0.24.0
2021-06-05 12:28:25 +01:00
Nick O'Leary
e9e64f6a44
Add option to RED.nodes.createCompleteNodeSet to include node dimensions
...
This allows the linter to use a flow json with more than just position
information.
2021-06-04 13:53:01 +01:00
Kazuhiro Ito
a7b8adb0e1
Fix allow Flow.getNode to return subflowInstance nodes
2021-06-04 15:08:03 +09:00
Jiye Yu
4140ff03d7
fix typo in zh-CN translation ( #3003 )
2021-06-03 19:03:00 +01:00
Nick O'Leary
e042ef05a4
Update dependencies
2021-06-02 16:24:12 +01:00
Nick O'Leary
7c02e4d66a
Merge branch 'master' into dev
2021-06-02 15:40:56 +01:00
Nick O'Leary
711794cfe1
Merge pull request #2993 from Steve-Mcl/master
...
ensure context get/set key is a string
2021-06-02 15:20:25 +01:00
Nick O'Leary
c0e4cf2358
Fix handling of boolean subflow module properties
...
Fixes #3000
2021-06-02 14:48:54 +01:00
Nick O'Leary
a92f8f36c1
Keep proper track of moved/changed state in undo/redo history
...
Fixes #2999
2021-06-02 14:07:22 +01:00
Nick O'Leary
12698dc347
Add full ast parsing in Function node to spot node.done calls
...
Fixes #2998
2021-06-02 12:32:44 +01:00
Nick O'Leary
3e6a55f78e
Update to latest 6.x ws module
2021-06-02 11:58:51 +01:00
Ben Hardill
7585f14b89
Watch node throws errors if new files deleted
...
before the node has finished processing them all.
Fixes #2996
2021-05-28 08:34:08 +01:00
Nick O'Leary
01b5fc4d49
Merge pull request #2987 from node-red/clean-ids
...
Change node id generation to give fixed length values without '.'
2021-05-27 12:18:38 +01:00
Nick O'Leary
2cd74d355c
Merge pull request #2994 from node-red/css-vars
...
Add css named variables for certain key colours
2021-05-27 12:18:05 +01:00
Nick O'Leary
3d405f8c63
Merge pull request #2969 from node-red/ajv-update
...
Update ajv to 8.2.0 - drop support for JSON-Schema draft-04
2021-05-27 12:17:51 +01:00
Steve-Mcl
a92f0c4c6e
fix context key validation + add tests
...
- adds a helper function validateContextKey to keep it DRY
- adds tests ensure key of null "" 1 {} [] [""] [1] [{}] all throw error
2021-05-26 13:04:09 +01:00
Nick O'Leary
de142ac9d6
Add css named variables for certain key colors
2021-05-25 21:03:01 +01:00
Nick O'Leary
468ef7ecff
Allow RED.settings.set to replace string property with object property
2021-05-25 21:02:14 +01:00
Steve-Mcl
4d768fd236
ensure context get/set key is a string
2021-05-25 14:53:06 +01:00
Steve-Mcl
bfc1f95190
remove redundant i18n entries
...
- no longer needed since moving inject onto edit form
2021-05-25 13:53:59 +01:00
Nick O'Leary
bc17ebd90e
Fix css of node help table of contents elements
2021-05-24 10:23:00 +01:00
Hiroyasu Nishiyama
4dbebefb45
fix handling empty rules
2021-05-23 10:01:45 +09:00
Steve-Mcl
e1c5764fbf
move new inject button to existing edit form
...
- revert refactoring of building editableList (not needed now)
- remove node button modifier click & tray.show feature
- add inject button to editableList [buttons] array
- add `id` option to editableList to permit DOM access after creation
- get the new inject button via its `id` and float it to the right
- removed the popup tray buttons i18n entries
2021-05-22 10:52:44 +01:00
Steve-Mcl
70f975e4f0
move inject button off dialog and onto form
2021-05-21 13:26:50 +01:00
Steve-Mcl
f570447000
i18n for buttons on user inject values
2021-05-20 22:53:10 +01:00
Steve-Mcl
9d7b8f1f2f
change user prop name for injected values
...
- less chance for collision
2021-05-20 22:35:42 +01:00
Steve-Mcl
bae6bfc32d
Add inject values without deploy feature
2021-05-20 21:12:32 +01:00
Nick O'Leary
8a63390464
Merge pull request #2988 from hardillb/ALPNProtocols
...
Add ALPN support to TLS node
2021-05-19 17:39:19 +01:00
Ben Hardill
0b52cd8b31
Fixes from testing
...
I set up a NGINX instance to test this and found I'd missed some bits.
Still can't find a way to test this easily from a nodejs unit test
2021-05-19 10:41:24 +01:00
Nick O'Leary
f97569dd34
Clarify codeEditor options only relate to monaco
2021-05-18 16:46:16 +01:00
Nick O'Leary
a9164e63ab
Merge branch 'dev' into pr_2971
2021-05-18 16:30:13 +01:00
Ben Hardill
8c95067ec4
Add ALPN support to TLS node
2021-05-18 13:13:32 +01:00
Nick O'Leary
4f77bbeb2b
Update for 1.3.5
2021-05-18 11:52:49 +01:00
Nick O'Leary
8bbed2c831
Change node id generation to give fixed length values without '.'
2021-05-18 11:32:17 +01:00
Nick O'Leary
6b43a23c4b
Merge branch 'master' into dev
2021-05-14 21:18:32 +01:00
Nick O'Leary
be9521f659
Revert some of #2967 to fix treeList gutter width calculation
2021-05-14 21:17:47 +01:00
Nick O'Leary
90761fd840
Fix 'SyntaxError' in Function node when last line of on-stop is a comment
2021-05-13 17:23:25 +01:00
Nick O'Leary
d49d9a783c
Merge branch 'master' into dev
2021-05-13 16:06:33 +01:00
Nick O'Leary
d7dc7c4eda
Fix error handling in runtime/lib/api/nodes
2021-05-13 15:46:56 +01:00
Nick O'Leary
fe64c6a841
Merge branch 'master' into dev
2021-05-13 14:30:02 +01:00
Nick O'Leary
2bbdc85a29
Prevent unknown node from breaking editor
...
If a node provides a .js file that registers a type
but its .html is empty, then the editor will know about
the type, but there will be no node definition.
This fix handles that in some of the utility functions
for generating node appearance.
This wasn't an exhaustive check for these things - just
some obvious candidates that I hit in testing 'bad' nodes
2021-05-13 14:28:01 +01:00
Nick O'Leary
15aa249f64
Stop module with missing types from preventing editor load
2021-05-13 14:06:43 +01:00
Nick O'Leary
fdf58e1225
Fix lint errors in editor hooks
2021-05-13 14:00:21 +01:00
Nick O'Leary
866f305686
Open subflow tab next to active tab rather than at the end
2021-05-13 13:57:29 +01:00
Nick O'Leary
1550e5343c
Merge branch 'master' into dev
2021-05-13 13:42:26 +01:00
