Nick O'Leary 
							
						 
					 
					
						
						
							
						
						f4ca8cd738 
					 
					
						
						
							
							Merge branch 'master' into dev  
						
						
						
						
					 
					
						2018-10-07 11:45:43 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						98c1bc276d 
					 
					
						
						
							
							Merge project package changes to avoid overwritten changes  
						
						
						
						
					 
					
						2018-10-07 11:37:50 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						629536b562 
					 
					
						
						
							
							Handle manually added project deps that are unused  
						
						... 
						
						
						
						Fixes  #1908  
					
						2018-10-07 11:11:30 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						422109868d 
					 
					
						
						
							
							Add markdown toolbar to node description editor  
						
						
						
						
					 
					
						2018-10-06 23:14:04 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						bcc7834650 
					 
					
						
						
							
							Add markdown formatting toolbar  
						
						
						
						
					 
					
						2018-10-05 17:56:54 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						1161e4f6c1 
					 
					
						
						
							
							Add tooltips to debug elements  
						
						
						
						
					 
					
						2018-10-05 17:56:42 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						22ede79799 
					 
					
						
						
							
							Add node body tooltip - limit to link nodes for now  
						
						
						
						
					 
					
						2018-10-03 15:40:05 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						6cb3699ee9 
					 
					
						
						
							
							Decrease opacity of flow-navigator  
						
						
						
						
					 
					
						2018-10-03 14:13:36 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						6c65d3830e 
					 
					
						
						
							
							Move editor locales into editor-client package  
						
						
						
						
					 
					
						2018-10-03 14:08:16 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						cdcf39fe82 
					 
					
						
						
							
							Update tooltip style and add to some editor buttons  
						
						
						
						
					 
					
						2018-10-03 14:02:07 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						b2f50da322 
					 
					
						
						
							
							Create custom ace javascript mode to handle Function sig  
						
						... 
						
						
						
						Fixes  #1911  
					
						2018-10-02 23:01:34 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						2a50c66df8 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/node-red/node-red  into dev  
						
						
						
						
					 
					
						2018-10-02 18:56:22 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						8de47c0a6e 
					 
					
						
						
							
							delay node: report queue activity wehn in by topic mode  
						
						
						
						
					 
					
						2018-10-02 18:56:17 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						023391e22a 
					 
					
						
						
							
							Merge pull request  #1899  from node-red-hitachi/fa-icon  
						
						... 
						
						
						
						Added font-awesome icons to user defined icon 
						
						
					 
					
						2018-10-02 14:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						a4ddfd404f 
					 
					
						
						
							
							Merge pull request  #1906  from node-red/Allow-button-to-be-invisible  
						
						... 
						
						
						
						If debug set not to go to sidebar hide the button 
						
						
					 
					
						2018-10-02 14:58:41 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						7307e558cb 
					 
					
						
						
							
							Merge pull request  #1910  from kazuhitoyokoi/dev-updatejapanesemessages  
						
						... 
						
						
						
						Update Japanese message catalog 
						
						
					 
					
						2018-10-02 14:57:31 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						47356f5221 
					 
					
						
						
							
							Merge pull request  #1909  from kazuhitoyokoi/dev-updatemessagecatalog  
						
						... 
						
						
						
						Add necessary p tag into English message catalog 
						
						
					 
					
						2018-10-02 14:55:14 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						c6f8950b64 
					 
					
						
						
							
							Merge pull request  #1905  from node-red/ace-update  
						
						... 
						
						
						
						Update ACE to 1.4.1-src-min-noconflict 
						
						
					 
					
						2018-10-02 14:54:52 +01:00 
						 
				 
			
				
					
						
							
							
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						071f4eacde 
					 
					
						
						
							
							Update Japanese message catalog  
						
						
						
						
					 
					
						2018-10-02 18:41:33 +09:00 
						 
				 
			
				
					
						
							
							
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						f96bdc578e 
					 
					
						
						
							
							Add necessary </p> tag into English message catalog  
						
						
						
						
					 
					
						2018-10-02 18:30:45 +09:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						e03a0fffa9 
					 
					
						
						
							
							Merge pull request  #1907  from amilajack/patch-2  
						
						... 
						
						
						
						Change repo badge to point to master branch 
						
						
					 
					
						2018-10-01 21:00:41 +01:00 
						 
				 
			
				
					
						
							
							
								Amila Welihinda 
							
						 
					 
					
						
						
							
						
						8e2c12f8d9 
					 
					
						
						
							
							Change repo badge to point to master branch  
						
						
						
						
					 
					
						2018-10-01 12:50:03 -07:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						114420e8fd 
					 
					
						
						
							
							If debug set not to go to sidebar hide the button  
						
						... 
						
						
						
						Add button.visible function to view.js
Make status independant of tosidebar setting 
						
						
					 
					
						2018-10-01 12:59:06 +01:00 
						 
				 
			
				
					
						
							
							
								nakanishi 
							
						 
					 
					
						
						
							
						
						ba49b2c681 
					 
					
						
						
							
							Hide brand icons of font-awesome from icon tile  
						
						
						
						
					 
					
						2018-10-01 18:39:43 +09:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						5391fc962a 
					 
					
						
						
							
							Update ACE to 1.4.1-src-min-noconflict  
						
						
						
						
					 
					
						2018-09-30 21:28:44 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						d6211af5bd 
					 
					
						
						
							
							Cache node locales by language  
						
						
						
						
					 
					
						2018-09-28 16:58:06 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						ef114e31c2 
					 
					
						
						
							
							Look for core-node language files in the right location  
						
						
						
						
					 
					
						2018-09-28 16:48:25 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						fd74a03479 
					 
					
						
						
							
							Fix grunt dev monitoring of src  
						
						
						
						
					 
					
						2018-09-28 16:21:49 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						428bf634e9 
					 
					
						
						
							
							Merge pull request  #1895  from node-red/Tidy-core-nodes  
						
						... 
						
						
						
						Tidy core nodes 
						
						
					 
					
						2018-09-28 13:20:58 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						c49f722e4f 
					 
					
						
						
							
							Merge pull request  #1891  from camlow325/resolve-example-path-for-windows-support  
						
						... 
						
						
						
						Resolve path when sending example file for Windows support 
						
						
					 
					
						2018-09-28 13:18:53 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						d4d95a43b6 
					 
					
						
						
							
							Merge pull request  #1900  from kazuhitoyokoi/master-addtestcases4settings.js  
						
						... 
						
						
						
						Add test cases for red/api/editor/settings.js 
						
						
					 
					
						2018-09-28 13:17:32 +01:00 
						 
				 
			
				
					
						
							
							
								nakanishi 
							
						 
					 
					
						
						
							
						
						8789d983ed 
					 
					
						
						
							
							Show icon element with either icon image or fa-icon  
						
						
						
						
					 
					
						2018-09-28 17:07:55 +09:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						10faa96bcf 
					 
					
						
						
							
							Exclude non-testable .js files from the unit tests  
						
						
						
						
					 
					
						2018-09-27 15:09:49 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						42d31b9ee6 
					 
					
						
						
							
							Move default settings back into node-red package  
						
						
						
						
					 
					
						2018-09-27 15:01:10 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						c9dc9b4fe9 
					 
					
						
						
							
							fix websocket feedback test - now doesn't spin  
						
						
						
						
					 
					
						2018-09-26 16:03:22 +01:00 
						 
				 
			
				
					
						
							
							
								Kazuhito Yokoi 
							
						 
					 
					
						
						
							
						
						67c268e13d 
					 
					
						
						
							
							Add test cases for red/api/editor/settings.js  
						
						
						
						
					 
					
						2018-09-26 10:22:01 +09:00 
						 
				 
			
				
					
						
							
							
								nakanishi 
							
						 
					 
					
						
						
							
						
						f13e02a1a9 
					 
					
						
						
							
							Added font-awesome icons to user defined icon  
						
						
						
						
					 
					
						2018-09-26 09:16:15 +09:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						d887ab126b 
					 
					
						
						
							
							Add --safe mode flag to allow starting without flows running  
						
						
						
						
					 
					
						2018-09-25 11:20:50 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						1a7868159a 
					 
					
						
						
							
							Split/join - add msg.reset to info panel  
						
						
						
						
					 
					
						2018-09-25 08:43:53 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						c6a1c8e8c4 
					 
					
						
						
							
							Fix corruption of websocket _session  
						
						
						
						
					 
					
						2018-09-25 08:40:29 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						fba339f666 
					 
					
						
						
							
							Prevent github from suppressing diffs  
						
						
						
						
					 
					
						2018-09-24 22:02:18 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						09d41a9708 
					 
					
						
						
							
							Merge pull request  #1896  from node-red/delay-flush  
						
						... 
						
						
						
						Delay node - add msg.flush option 
						
						
					 
					
						2018-09-24 21:53:28 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						ce85c8d986 
					 
					
						
						
							
							Ensure all palette categories are opened properly  
						
						... 
						
						
						
						Closes  #1893  
					
						2018-09-24 21:15:39 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						4630a162af 
					 
					
						
						
							
							Add msg.flush mode to delay node  
						
						... 
						
						
						
						to spew out contents rather than dump
(as per Trello item) 
						
						
					 
					
						2018-09-23 17:31:11 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						fde157ff50 
					 
					
						
						
							
							remove cr lf from incoming filename so easier to pass in results from exec node.  
						
						... 
						
						
						
						and add test 
						
						
					 
					
						2018-09-23 10:36:50 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						51f875c02d 
					 
					
						
						
							
							reset join without sending part array  
						
						... 
						
						
						
						(thought this had been fixed already ?) 
						
						
					 
					
						2018-09-23 10:35:47 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						f0957c838f 
					 
					
						
						
							
							add watched filename to msg.filename so can feed direct to file in node  
						
						
						
						
					 
					
						2018-09-23 10:35:18 +01:00 
						 
				 
			
				
					
						
							
							
								Dave Conway-Jones 
							
						 
					 
					
						
						
							
						
						f5bebef37f 
					 
					
						
						
							
							websocket - preserve _session on msg but don't send as part of wholemsg  
						
						
						
						
					 
					
						2018-09-23 10:34:22 +01:00 
						 
				 
			
				
					
						
							
							
								Nick O'Leary 
							
						 
					 
					
						
						
							
						
						80a15089b4 
					 
					
						
						
							
							Add markdown-preview to expandable editor for ndoe descriptions  
						
						
						
						
					 
					
						2018-09-21 17:21:04 +01:00 
						 
				 
			
				
					
						
							
							
								Jeremy Barlow 
							
						 
					 
					
						
						
							
						
						cb35604ef5 
					 
					
						
						
							
							Resolve path when sending example file for Windows support  
						
						... 
						
						
						
						Previously, when trying to import an example into the flow editor on
Windows, the load attempt would fail with an HTTP 404 error in the
browser client, with a `TypeError: path must be absolute or specify
root to res.sendFile` error being written to the Node-RED log. This was
due to the path being passed to the `res.sendFile` function not being
fully-qualified (for example, `\Users\myuser\...\example.json`).
With the changes in this commit, the path to the example file is
resolved to a fully-qualified path before being passed into the
`res.sendFile` call. For example, a path on Windows of
`\Users\myuser\...\example.json` would be transformed to
`C:\\Users\\myuser\\...\\example.json` before being passed along to the
`sendFile` function. This change allows the file to be loaded and sent
properly to the browser client and for the embedded flows in the example
to be loaded in the flow editor. 
						
						
					 
					
						2018-09-21 08:15:00 -07:00