28 Commits

Author	SHA1	Message	Date
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	6191a49ed3	Use flow-diff to resolve merge conflicts	2018-02-13 23:09:51 +00:00
Nick O'Leary	d5619d2b9d	Fix up merge conflict handling	2018-02-08 22:22:58 +00:00
Nick O'Leary	ad6e55ca17	Allow a user to install missing modules from project settings	2018-01-22 13:46:11 +00:00
Nick O'Leary	028d66befc	Add suitable message when not displaying binary files	2017-12-11 17:05:27 +00:00
Nick O'Leary	10057de9b3	A big projects update ... Includes: - change local/remote branches - basic support for username/password handling	2017-11-21 23:31:41 +00:00
Nick O'Leary	57533fd831	Add commit-diff view	2017-10-25 15:26:24 +01:00
Nick O'Leary	b9a3563e5b	Handle 'No newline' message in text diffs	2017-10-20 21:29:43 +02:00
Nick O'Leary	19c84eb694	Add commit history view in sidebar	2017-10-09 23:37:19 +01:00
Nick O'Leary	10567afbb9	Add unified diff view to version control tab	2017-10-09 00:11:07 +01:00
Nick O'Leary	51bad3bf3c	Add dual text-diff	2017-10-08 22:03:06 +01:00
Nick O'Leary	5b3b5271ad	Remove test diff code	2017-08-07 16:38:15 +01:00
Kazuhito Yokoi	d7d13c12fe	Modify messages to refer to language files (#1361)	2017-08-07 10:00:28 +01:00
Nick O'Leary	f808e85da9	Diff view: subflows can have port labels as well	2017-08-04 14:26:05 +01:00
Nick O'Leary	7de1bf9d95	Better node properties layout in diff table	2017-08-03 23:04:39 +01:00
Nick O'Leary	7368b0cefb	Make diff tool a maximised tray rather than dialog	2017-08-03 09:58:25 +01:00
Nick O'Leary	4af43d676a	Include input/output labels in diff view	2017-08-02 21:57:23 +01:00
Nick O'Leary	eaf08a9971	Keep local/remote diff objects in sync as they expand	2017-07-31 23:29:36 +01:00
Nick O'Leary	d4d87054c4	Ensure tab property changes are listed in diff view	2017-07-26 07:55:53 -07:00
Nick O'Leary	0f93929544	Fix diff view node properties table rendering	2017-07-26 07:47:19 -07:00
Nick O'Leary	11f4ae019c	Include module name in requests for node icons	2017-01-18 13:06:22 +00:00
Nick O'Leary	83acb66f00	NLS the diff dialog	2017-01-04 22:02:35 +00:00
Nick O'Leary	7970c9dbe5	Merge changes by reimporting changed node config	2017-01-01 00:20:12 +00:00
Nick O'Leary	5ca0c066e2	Better handling of moved nodes	2017-01-01 00:20:12 +00:00
Nick O'Leary	563728c7b8	Some more merging code	2017-01-01 00:20:12 +00:00
Nick O'Leary	31a72b6562	Three-way-diff	2017-01-01 00:20:12 +00:00
Nick O'Leary	d3dfbc3034	Add proper three-way diff view	2017-01-01 00:20:11 +00:00
Nick O'Leary	226ad3fe22	Add missing diff file	2016-12-07 13:51:20 +00:00