587 Commits

Author	SHA1	Message	Date
Nick O'Leary	8957d33e49	Merge branch 'master' into runtime-api	2018-05-11 14:17:46 +01:00
Nick O'Leary	d49c7a3adb	Avoid unnecessary use of .html() where .text() will do	2018-05-11 14:05:52 +01:00
Nick O'Leary	28fe1e4c8f	Allow the editor to use a custom admin api url root	2018-05-11 13:26:26 +01:00
Nick O'Leary	0c7f4e2168	Merge 0.18.5	2018-05-10 21:45:25 +01:00
Nick O'Leary	08727e1938	Show node load errors in the palette manager	2018-05-10 11:21:59 +01:00
Nick O'Leary	53e3e08d70	Handle cloning a project without package.json	2018-05-02 16:24:58 +01:00
Nick O'Leary	c4d1ccb6f5	Keep remote branch state in sync between editor and runtime	2018-05-02 13:59:39 +01:00
Nick O'Leary	e3520309fc	Add clone project to welcome screen	2018-05-02 13:38:50 +01:00
Nick O'Leary	80062b6a62	Move type editors into their own files	2018-05-01 12:28:15 +01:00
Nick O'Leary	2dab1d3e6e	Fix up merge issue on api/nodes	2018-05-01 12:28:14 +01:00
Nick O'Leary	64ae67586a	Ensure keyboard shortcuts get saved in runtime settings ... Fixes #1696	2018-04-15 11:43:03 +01:00
Nick O'Leary	ebb3fb96cd	Merge pull request #1670 from node-red-hitachi/subflow-icon-change ... Enable user defined icon for subflow	2018-03-27 10:22:20 +01:00
Kazuki-Nakanishi	8b0e76dd55	Hide the subflow check logic inside getDefaultNodeIcon function	2018-03-22 14:14:09 +09:00
Dave Conway-Jones	884618adfe	remove down carat from typed input with only 1 type	2018-03-20 21:01:10 +00:00
Kazuki Nakanishi	2d52527fb4	Don't mark a subflow changed when actually modified nothing (#1665)	2018-03-20 20:39:46 +00:00
Kazuki-Nakanishi	d9350b2362	Enable user defined icon for subflow	2018-03-14 13:51:50 +09:00
Nick O'Leary	af947879d8	Merge pull request #1614 from node-red-hitachi/no-tabs ... Fix the problem that the last flow tab can be deleted	2018-02-22 19:02:12 -08:00
Kazuki-Nakanishi	3ed112cde6	Changed coding style	2018-02-23 11:48:40 +09:00
Kazuki-Nakanishi	f21260370f	Fixed the problems when using a node without defaults	2018-02-22 14:10:31 +09:00
Nick O'Leary	0123eacbdb	Merge pull request #1642 from node-red-hitachi/subflow-icon ... Disable user defined icon for subflow	2018-02-21 08:24:41 -08:00
Nick O'Leary	53401b6aa7	Fix merging a remote diff	2018-02-20 15:01:45 -08:00
Nick O'Leary	9a5139f452	Detect if there are no existing flows to migrate into a project	2018-02-20 14:30:37 -08:00
Nick O'Leary	2ee0c8c228	Use relative urls when retriving flow history	2018-02-20 14:27:47 -08:00
Kazuki-Nakanishi	c53562cc9c	Disable user defined icon for subflow	2018-02-20 15:29:52 +09:00
Nick O'Leary	ec5d7c2e5c	Add credentialSecret to clone pane	2018-02-18 17:09:19 +00:00
Nick O'Leary	d6fc258485	Delay clearing inflight when changing credentials key	2018-02-18 16:43:40 +00:00
Nick O'Leary	f953612695	Mark deploy inflight when reverting a file change	2018-02-18 16:30:47 +00:00
Kazuki-Nakanishi	2ab93acca8	Revise the fix for the problem that the last flow tab can be deleted	2018-02-16 11:54:52 +09:00
Nick O'Leary	326c6c496e	Handle missing_flow_file error on clone properly	2018-02-15 22:47:07 +00:00
Nick O'Leary	9f7f50664c	Remote project from cached list on delete so it can be reused	2018-02-15 22:46:36 +00:00
Nick O'Leary	f6f1436123	getDefaultNodeIcon should handle subflow instance nodes ... Fixes #1635	2018-02-15 15:34:15 +00:00
Nick O'Leary	1a4389c90d	Fix offset calculation when dragging node from palette	2018-02-14 13:37:24 +00:00
Nick O'Leary	fdaa5ce1da	Merge pull request #1624 from node-red/library-extra-element ... let library createUi accept elements other than node-input-name	2018-02-14 13:16:39 +00:00
Nick O'Leary	09d9936aed	Change remote-diff shortcut and add it to keymap ... Fixes #1628	2018-02-14 09:54:07 +00:00
Nick O'Leary	a25dad6c2e	Ensure debug tools show for 'complete msg object'	2018-02-13 23:42:22 +00:00
Nick O'Leary	6191a49ed3	Use flow-diff to resolve merge conflicts	2018-02-13 23:09:51 +00:00
Dave Conway-Jones	5fbd5bf9e2	handle other fields in library - by only changing prefix ... (rather than whole property - so ...-name is still the name required)	2018-02-10 16:49:47 +00:00
Dave Conway-Jones	5e87828b29	let library createUi accept elements other than node-input-name	2018-02-10 16:16:49 +00:00
Nick O'Leary	9066cedc29	Better merge-conflict commit button layout	2018-02-09 09:35:47 +00:00
Nick O'Leary	aa1cf0b228	Avoid git fetch when refreshing local status	2018-02-08 23:30:07 +00:00
Nick O'Leary	06a6a4408f	Handle allow-unrelated-histories option on pull	2018-02-08 23:21:14 +00:00
Nick O'Leary	d5619d2b9d	Fix up merge conflict handling	2018-02-08 22:22:58 +00:00
Kazuki-Nakanishi	c316284924	Fix the problem that the last flow tab can be deleted	2018-02-07 14:19:18 +09:00
Nick O'Leary	5fe5db603d	Better error handling/reporting in project creation	2018-02-05 15:59:11 +00:00
Nick O'Leary	9f7dd7f5d4	Add Project Settings menu option	2018-02-05 10:58:09 +00:00
Nick O'Leary	e6d32aab7b	Refresh vc sidebar on remote add/remove	2018-02-05 10:10:26 +00:00
Nick O'Leary	22d942b705	Fix auth prompt for ssh repos	2018-02-03 23:44:19 +00:00
Nick O'Leary	d1f7fd8bfd	Prevent http git urls from including username/pword	2018-02-02 22:43:29 +00:00
Nick O'Leary	fc1436a96d	Fix fetch auth handling on non-default remote	2018-02-02 16:26:55 +00:00
Nick O'Leary	407123a280	Add git_pull_unrelated_history handling	2018-02-01 17:07:46 +00:00