frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,545 Commits 119 Branches 156 Tags 55 MiB
Commit Graph

8 Commits

Author SHA1 Message Date
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