Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						d8f4f92e1d
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/dev' into dev
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-21 16:39:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						ce679f90ee
					 | 
					
						
						
							
							Merge pull request #4177 from k1ln/adding-timeout-to-functio-node
						
						
						
						
						
						
						
						adding timeout attribute to function node 
						
						
							
						
					 | 
					
						2023-06-21 15:57:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						8fb379079b
					 | 
					
						
						
							
							Merge pull request #4225 from node-red/4196-fix-jsonata-env-var-async
						
						
						
						
						
						
						
						Add callback to getSetting to support async jsonata access 
						
						
							
						
					 | 
					
						2023-06-21 15:56:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						b382d048de
					 | 
					
						
						
							
							Merge pull request #4227 from node-red/4196-add-callback-opt-to-env.get
						
						
						
						
						
						
						
						Adds optional callback to env.get in function node 
						
						
							
						
					 | 
					
						2023-06-21 15:55:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						4d9fcaeebf
					 | 
					
						
						
							
							Update env.get type hint
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-21 15:00:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						aa0225f59f
					 | 
					
						
						
							
							Apply suggestions from code review
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-21 14:27:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						2571949e90
					 | 
					
						
						
							
							Merge pull request #4143 from inNETMonitoring/fix/joinManual
						
						
						
						
						
						
						
						fix: closes #4142 
						
						
							
						
					 | 
					
						2023-06-21 14:24:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kilian Hertel
							
						 
					 | 
					
						
						
							
						
						20d2c11154
					 | 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-21 15:24:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						3f604e9d93
					 | 
					
						
						
							
							Adds optional callback to env.get in function node
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-21 14:20:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						01c56f6515
					 | 
					
						
						
							
							Merge pull request #4200 from GogoVega/french-translation-of-welcome-tours
						
						
						
						
						
						
						
						French translation of Welcome Tours 
						
						
							
						
					 | 
					
						2023-06-21 14:03:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						026be5a990
					 | 
					
						
						
							
							Merge pull request #4199 from GogoVega/french-translation-of-v3.1.0-beta.3
						
						
						
						
						
						
						
						French translation of v3.1.0-beta.3 changes 
						
						
							
						
					 | 
					
						2023-06-21 14:01:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						aafb86ef09
					 | 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-21 13:35:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						1a24efe85d
					 | 
					
						
						
							
							Merge pull request #4209 from HiroyasuNishiyama/jp-message
						
						
						
						
						
						
						
						add Japanese message for 3.1.0 beta 3 
						
						
							
						
					 | 
					
						2023-06-21 13:34:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						0b3f7dbb1f
					 | 
					
						
						
							
							Merge pull request #4203 from node-red/fix-delay-node-flush-issue-4202
						
						
						
						
						
						
						
						Fix delay node flush issue 
						
						
							
						
					 | 
					
						2023-06-21 13:27:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						e90007860c
					 | 
					
						
						
							
							Merge pull request #4207 from node-red/4197-status-catch-label
						
						
						
						
						
						
						
						Update status and catch node labels in group mode 
						
						
							
						
					 | 
					
						2023-06-21 13:27:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						74ab03288b
					 | 
					
						
						
							
							fix typos in test flows
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-20 12:18:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						502dacd865
					 | 
					
						
						
							
							fix failure to return after calling callback
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-17 22:44:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						31bc99cd61
					 | 
					
						
						
							
							remove .only
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-17 22:29:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						5435c9ebd2
					 | 
					
						
						
							
							fix test (missing getUserSettings stub 🤷♂️)
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-17 22:12:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						ceb9a320ba
					 | 
					
						
						
							
							expand existing env var test for all scenarios
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-17 22:11:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						ee8b2a0b58
					 | 
					
						
						
							
							Delete stray it.only
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-17 22:03:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						8202f1b7c6
					 | 
					
						
						
							
							Add env var is JSONata expr test
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-17 21:54:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						4808cac89d
					 | 
					
						
						
							
							Add async to all paths that JSONata env var calls
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-17 21:14:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kilian Hertel
							
						 
					 | 
					
						
						
							
						
						220a621dc6
					 | 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-02 12:20:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								BitCaesar
							
						 
					 | 
					
						
						
							
						
						0db288e6dc
					 | 
					
						
						
							
							Merge branch 'dev' into fix/joinManual
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-31 16:10:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen McLaughlin
							
						 
					 | 
					
						
						
							
						
						f8175fc325
					 | 
					
						
						
							
							Update packages/node_modules/@node-red/nodes/locales/en-US/messages.json
						
						
						
						
						
						
						
						Co-authored-by: Nick O'Leary <nick.oleary@gmail.com> 
						
						
							
						
					 | 
					
						2023-05-31 14:11:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen McLaughlin
							
						 
					 | 
					
						
						
							
						
						5eee38e7de
					 | 
					
						
						
							
							Update packages/node_modules/@node-red/nodes/locales/en-US/messages.json
						
						
						
						
						
						
						
						Co-authored-by: Nick O'Leary <nick.oleary@gmail.com> 
						
						
							
						
					 | 
					
						2023-05-31 14:10:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						fb5b470966
					 | 
					
						
						
							
							Merge pull request #4208 from node-red/4198-group-edit-stack-overflow
						
						
						
						
						
						
						
						Dont clone the group nodes `node` array when saving edits 
						
						
							
						
					 | 
					
						2023-05-31 09:50:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kilian Hertel
							
						 
					 | 
					
						
						
							
						
						876053f858
					 | 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-30 14:55:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GogoVega
							
						 
					 | 
					
						
						
							
						
						9714ef19de
					 | 
					
						
						
							
							Missing french translation of beta 3 changes
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-30 14:19:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HiroyasuNishiyama
							
						 
					 | 
					
						
						
							
						
						613a345771
					 | 
					
						
						
							
							add additional Japanese translation for status and catch node
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-30 20:58:17 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								BitCaesar
							
						 
					 | 
					
						
						
							
						
						4fe29dd33f
					 | 
					
						
						
							
							Merge branch 'dev' into fix/joinManual
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-30 10:42:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						4b24223290
					 | 
					
						
						
							
							Dont clone group node node array
						
						
						
						
						
						
						
						fixes #4198 
						
						
							
						
					 | 
					
						2023-05-29 23:55:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						a78da0db1e
					 | 
					
						
						
							
							Update status and catch node labels in group mode
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-29 22:47:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dave Conway-Jones
							
						 
					 | 
					
						
						
							
						
						5e4fce1e12
					 | 
					
						
						
							
							Fix delay node flush issue
						
						
						
						
						
						
						
						to close #4202 
						
						
							
						
					 | 
					
						2023-05-27 17:51:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GogoVega
							
						 
					 | 
					
						
						
							
						
						4cb2624a5d
					 | 
					
						
						
							
							French translation of Welcome Tours
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-26 20:58:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GogoVega
							
						 
					 | 
					
						
						
							
						
						58e045f25d
					 | 
					
						
						
							
							French translation of changes from v3.1.0-beta.3
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-26 20:52:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						26a770e490
					 | 
					
						
						
							
							Merge pull request #4192 from node-red/prep-310-beta3
						
						
						
						
						
						
						
						Bump everything for beta.3 
						
						
							
 3.1.0-beta.3
						
					 | 
					
						2023-05-26 13:31:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						dfe145a0ed
					 | 
					
						
						
							
							Merge pull request #4190 from Steve-Mcl/fix-mqtt-keep-subscription-4132
						
						
						
						
						
						
						
						Fix new feature "mqtt keep subscription" 
						
						
							
						
					 | 
					
						2023-05-26 13:31:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						6cb4c9224d
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/dev' into fix-mqtt-keep-subscription-4132
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-26 10:46:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						1978a360af
					 | 
					
						
						
							
							Merge pull request #4191 from node-red/update-xml2js
						
						
						
						
						
						
						
						Update xml2js 
						
						
							
						
					 | 
					
						2023-05-26 10:30:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						1f46b3fda9
					 | 
					
						
						
							
							Merge pull request #4193 from kazuhitoyokoi/prep-310-beta3-jp
						
						
						
						
						
						
						
						Add Japanese translations for v3.1.0-beta.3 
						
						
							
						
					 | 
					
						2023-05-26 10:29:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						47a945d92e
					 | 
					
						
						
							
							Merge pull request #4195 from node-red/4191-function-error-badge-not-shown
						
						
						
						
						
						
						
						fix function node error badge not shown 
						
						
							
						
					 | 
					
						2023-05-26 10:29:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steve-Mcl
							
						 
					 | 
					
						
						
							
						
						59ec87a393
					 | 
					
						
						
							
							fix function node error badge not shown
						
						
						
						
						
						
						
						fixes #4194 
						
						
							
						
					 | 
					
						2023-05-26 10:12:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kazuhito Yokoi
							
						 
					 | 
					
						
						
							
						
						9423104dad
					 | 
					
						
						
							
							Add Japanese translations for v3.1.0-beta.3
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-26 12:35:53 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						614834090e
					 | 
					
						
						
							
							Bump everything for beta.3
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-25 18:10:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						2f9523a586
					 | 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-25 17:43:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						3a9f38a873
					 | 
					
						
						
							
							Merge branch 'master' into dev
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-25 17:42:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						0697c26dd1
					 | 
					
						
						
							
							Merge branch 'dev' into adding-timeout-to-functio-node
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-25 17:33:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick O'Leary
							
						 
					 | 
					
						
						
							
						
						cfa25dc655
					 | 
					
						
						
							
							Update xml2js
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-25 17:30:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |