Hideki Nakamura
3adfe249b0
Support to delete project feature ( #1509 )
...
* First commit to support to delete projects
* Add delete project menu & Implement delete project API
* Correspond to the PR feedback
2017-12-07 14:28:26 +00:00
Nick O'Leary
f86d3a69d2
Fix merge-abort button
2017-12-06 22:39:20 +00:00
Nick O'Leary
1840d15397
Restructure how editor/git settings are saved in userSettings
2017-12-05 23:50:32 +00:00
Hideki Nakamura
6d633b372a
Add git config UI ( #1506 )
...
* Add Git config tab
* Get usersetting data via admin HTTP API
* Delete git committer edit form in Project Settings tab
* Corresponding to the PR feedback
2017-12-05 16:14:20 +00:00
Nick O'Leary
91352e855a
Handle overwrite warning on local branch change
2017-12-05 16:12:07 +00:00
Nick O'Leary
1b632894d3
Save editor settings in /settings/user
2017-12-05 10:20:13 +00:00
Nick O'Leary
a7e14f1093
Handle a local branch that does not yet track a remote
2017-12-04 13:26:47 +00:00
Nick O'Leary
94eeaeb8d3
Allow committer details to be set per-user
2017-12-04 11:42:44 +00:00
Nick O'Leary
64191e8303
Merge master to 0.18
2017-12-03 22:32:28 +00:00
Nick O'Leary
21cfb71617
Add modal notification type with buttons
2017-12-03 22:26:17 +00:00
tilleul
19e45389e1
Updated regex so custom width using calc() work ( #1487 )
...
So far, for typedInput "<input type=text>" fields, only custom styles like "width:100%" or "width:75px" worked. Proposed change allows to use calc() as well like in "width:calc(100% - 120px)"
2017-11-30 13:38:03 +00:00
Kazuki Nakanishi
6d2389945b
allow a node's icon to be set dynamically ( #1490 )
...
* create a proto type
* Fixed some problems after reviewing
2017-11-30 13:13:35 +00:00
Nick O'Leary
14c48253f6
Confirm actions that would overwrite dirty workspace
2017-11-24 23:12:35 +00:00
Nick O'Leary
5c88888e02
Better auth handling in projects
2017-11-23 00:27:13 +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
Thiago Bustamante
10ceed30c6
Fix #1456
...
When importing new nodes, it is necessary to check the 'exclusive' flag
2017-11-03 11:34:41 -02:00
Hiroki Uchikawa
d7f59dac84
Make it possible to save formatting choices separately by the type of object ( #1458 )
2017-11-02 16:50:35 +00:00
Nick O'Leary
3745504107
Keep version sidebar in sync with project
2017-10-25 15:36:41 +01: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
3d6468326a
Allow a project's flow file to be changed
2017-10-19 21:38:53 +01:00
Kazuhito Yokoi
298e37ec53
Fix problem in node pull-down menu ( #1448 )
2017-10-19 13:52:25 +01:00
Nick O'Leary
5218a3fbac
Add custom project.toJSON to simplify state mangement
2017-10-17 10:14:50 +01:00
Nick O'Leary
4569cb432d
Add Project object in runtime
2017-10-16 23:23:50 +01:00
Kazuhito Yokoi
3479c794de
Modify JSONata Expression editor to refer to language files ( #1433 )
2017-10-10 20:21:41 +01:00
Nick O'Leary
19c84eb694
Add commit history view in sidebar
2017-10-09 23:37:19 +01:00
Nick O'Leary
eae390acf5
Disable view-diff button for deletes/unknown files
2017-10-09 12:10:00 +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
9a2fd0e2b2
Add initial version control sidebar with commit function
2017-10-07 00:18:20 +01:00
Dave Conway-Jones
039bd1ddc0
Auto hide empty palette categories ( #1395 )
...
to close #1382
2017-09-27 17:05:18 +01:00
Nick O'Leary
6a06142e1e
Allow credSecret to be managed via project settings
2017-09-26 22:51:08 +01:00
Nick O'Leary
d8fd218409
Allow project dependencies to be edited in dialog
2017-09-21 11:19:24 +01:00
Nick O'Leary
edc2310599
Move project sidebar to project settings dialog
2017-09-20 22:51:28 +01:00
Nick O'Leary
b1cd13d629
Initial projects implementation
2017-09-20 10:30:07 +01:00
Nick O'Leary
96a0dbea2d
Don't include subflow meta-port nodes in exported selection
...
Fixes #1362
2017-08-08 15:48:54 +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
1671d1f580
Allow expanding diff elements to stay in-sync deeper
2017-08-04 14:23:28 +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
67dc848b2d
getNodeIcon should handle subflow types properly
2017-08-02 21:55:25 +01:00
Nick O'Leary
7ec8f0d26b
Do not include tab types in typeSearch dialog
2017-08-02 21:54:58 +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
1c0e794f87
Ensure tabs get their definition object properly attached
2017-07-26 07:46:22 -07:00
Nick O'Leary
fc9906624e
Disable editor whilst a deploy is inflight
...
Fixes #1332
2017-07-08 21:16:52 +01:00
Nick O'Leary
ba6209ba54
Replace Unknown nodes with their real versions when node loaded
2017-07-08 17:30:17 +01:00
Nick O'Leary
f9769a73fe
Retry auto-install of modules that fail
...
- introduces autoInstallModulesRetry - default 30000
- backs off interval if repeated failures
- fixes notification to the editor of an auto-reinstall
2017-07-08 17:30:17 +01:00
Nick O'Leary
266274135e
Handle importing only one end of a link node pair
2017-07-04 23:40:37 +01:00
Nick O'Leary
a737810c50
Add reformat button to JSONata test data editor
2017-07-03 21:57:55 +01:00
Nick O'Leary
f3840512ba
Clear moved flag when nodes are deployed
2017-06-30 21:48:38 +01:00
Nick O'Leary
7429f66d6b
Mark nodes that have really moved as changed
2017-06-29 23:23:16 +01:00
Nick O'Leary
74ea85d19c
Ensure existing grid settings are migrated to new keys
2017-06-28 22:16:11 +01:00
Chaya Stern
a780d4463c
Support category with more than one word ( #1301 )
2017-06-28 14:27:54 +01:00
Nick O'Leary
83ebcf1dae
Reset palette-manager tabs when settings dialog reopened
2017-06-27 14:17:26 +01:00
Nick O'Leary
7a1e4e9e99
Ensure all ace editors are destroyed in the expression editors
2017-06-26 14:23:48 +01:00
Nick O'Leary
e590313297
Expression editor - clear legacy flag for blank expressions
2017-06-26 14:12:20 +01:00
Nick O'Leary
e9c1216d5c
Handle logging out and already logged-out editor
...
Fixes #1288
2017-06-26 10:49:06 +01:00
Nick O'Leary
df9e50445e
Merge branch 'master' into 0.17
2017-06-26 10:18:42 +01:00
Chaya Stern
9cd751e977
Fix bug: Export Subflows ( #1282 )
...
* fix bug with export subflows
* fix bug with export config-nodes
2017-06-26 10:07:44 +01:00
Nick O'Leary
d9dc171c28
Add buffer mode to typedInput
2017-06-13 21:01:27 +01:00
Nick O'Leary
f688b8d299
Refresh sidebar info when tab is changed
2017-06-06 10:27:03 +01:00
Dave Conway-Jones
d8e6a7b687
better spacing for library widget
2017-06-05 17:04:31 +01:00
Nick O'Leary
f527841c29
Fix gridSize for node width calculation to avoid odd resizing
2017-06-05 16:10:47 +01:00
Nick O'Leary
48a8dc0989
Redraw grid properly if gridSize changes
2017-06-05 16:07:21 +01:00
Nick O'Leary
65e27a268d
Scroll sidebar info tab to top when changing content
2017-05-24 21:41:18 +01:00
Nick O'Leary
6bd59b10c7
Ensure info tab sections are collapsible when set from palette
2017-05-24 21:11:23 +01:00
Nick O'Leary
6a6a692891
Only show tab info if there is an active tab
2017-05-24 20:58:16 +01:00
Nick O'Leary
9c6452544b
Don't try to nls status text starting with '.'
...
Fixes #1258
2017-05-24 12:21:35 +01:00
Nick O'Leary
3d2e6aea7b
Remember test expression data on a per-node basis
2017-05-23 15:54:09 +01:00
Nick O'Leary
1e9ce550db
Handle empty array/objects in debug view
2017-05-22 20:13:39 +01:00
Nick O'Leary
6278dfa77e
Only check for reordered outputs if outputMap defiend
2017-05-22 13:45:56 +01:00
Nick O'Leary
2a3e355437
Add per-node filter option to Debug pane
2017-05-22 11:35:55 +01:00
Nick O'Leary
e69e5b4f50
Ensure node labels are reordered properly to match outputs
2017-05-19 22:56:29 +01:00
Nick O'Leary
483306e73c
Avoid circular references when stingifying node objects
2017-05-19 20:36:22 +01:00
Nick O'Leary
5b5f9aa01d
Add 'none' placeholder for empty port label form
2017-05-15 16:26:42 +01:00
Nick O'Leary
f39b4e7d22
Node status should be on by default
2017-05-12 22:47:59 +01:00
Nick O'Leary
c09bea4710
Add debug message menu
2017-05-12 22:12:55 +01:00
Nick O'Leary
879c0f4114
Don't mark a node changed when going from none to blank labels
2017-05-12 19:55:36 +01:00
Nick O'Leary
5feb07583b
Don't include msg. in debug message copied paths
2017-05-12 10:19:50 +01:00
Nick O'Leary
5388002f54
Format Buffer numbers as hex by default
2017-05-11 21:15:16 +01:00
Nick O'Leary
d9ef32d7e8
Remember formatting choices for dbg msg elements
2017-05-11 17:00:49 +01:00
Nick O'Leary
7730d0a4f8
Merge branch 'master' into 0.17
2017-05-11 15:10:12 +01:00
Nick O'Leary
e79da408a8
Allow debug msg elements to be pinned
2017-05-11 15:08:10 +01:00
Nick O'Leary
085fb283e5
Fix test for valid js identifiers in debug path construction
2017-05-10 16:25:46 +01:00
Nick O'Leary
00460d856b
Add copy path/value buttons to debug messages
2017-05-10 15:49:56 +01:00
Nick O'Leary
401d386812
Add force-deploy option when conflict detected
2017-05-05 15:52:37 +01:00
Nick O'Leary
6b07f58e8e
NLS jsonata test messages
2017-05-05 13:43:39 +01:00
Nick O'Leary
dbf0486acb
Add JSONata expr tester and improved feedback
2017-05-05 11:23:24 +01:00
Nick O'Leary
b030e935ce
Hide tip box on startup if disabled
2017-05-03 21:27:08 +01:00
Nick O'Leary
2249b9449c
NLS Expression/JSON editor and fix their height calculation
2017-05-03 17:17:36 +01:00
Nick O'Leary
ed1a55d9cd
Provide feedback when enable/disable node fails
2017-05-03 13:29:35 +01:00
Nick O'Leary
93ef84f495
Move palette editor to settings panel
2017-05-03 11:38:16 +01:00
Nick O'Leary
ccfcbe8526
Move palette editor to userSettings dialog
2017-05-03 11:38:16 +01:00
Nick O'Leary
5938143002
Move view and keyboard into user settings dialog
2017-05-03 11:38:16 +01:00
Nick O'Leary
8135da71bd
Add basic user settings panel
2017-05-03 11:38:16 +01:00
Nick O'Leary
4689d56955
Allow a node to decide for itself if its button should be enabled or not
...
This means:
1. an Inject node that has only been moved can still inject
2. the Debug node is now marked as changed when its button is clicked
which, without this fix, then prevented the button from being
clicked to toggle its state again
2017-04-23 23:20:50 +01:00
Nick O'Leary
aa1b2808e7
Track node moves separately to node config changes
2017-04-23 23:20:36 +01:00
Cor Bosman
40ad4bdbd8
dont match only part of the node type ( #1242 )
2017-04-22 22:08:09 +01:00
Nick O'Leary
72da7e6c54
Rename oauth auth scheme to strategy as it works for openid
2017-04-21 21:54:48 +01:00
Nick O'Leary
7bd0943412
Provide single endpoint to load all node message catalogs
...
Replaces potentially dozens of http requests with one or two.
2017-04-21 11:49:35 +01:00
Nick O'Leary
61890f19bc
Use queryCommandSupported not queryCommandEnabled to check for copy support
2017-04-21 09:05:03 +01:00
Dave Conway-Jones
2ac9c11ec9
Add tip to tab description editor
...
(and remove icons)
2017-04-16 21:08:32 +01:00
Dave Conway-Jones
1c470ab9e3
Make tab info edit box resizable
2017-04-16 20:25:15 +01:00
Nick O'Leary
5cb37148c6
Add editorTheme.logout.redirect to allow redirect on logout
...
Closes #1213
2017-04-12 21:41:16 +01:00
Nick O'Leary
c54cf26848
Add support for oauth adminAuth configs
2017-04-12 10:09:03 +01:00
Nick O'Leary
83ca8147ca
Merge branch 'pr_1197' into 0.17
2017-04-10 15:25:19 +01:00
Nick O'Leary
1c11e7f97b
Shrink config node appearance in info table
2017-04-10 14:33:21 +01:00
Nick O'Leary
aefae79186
Display config nodes in Info sidebar table
2017-04-10 11:29:52 +01:00
Nick O'Leary
4b05a9bb6f
Ensure flow info box updates after editing flow
2017-04-10 00:00:10 +01:00
Nick O'Leary
2453719a87
Make H3 sections in node help collapsible
2017-04-07 13:30:12 +01:00
Nick O'Leary
ea929b00e3
Hide Node info section when displaying changelog
2017-04-07 12:36:06 +01:00
Nick O'Leary
ede940a398
Allow tips to be hidden and cycled through
2017-04-07 12:24:39 +01:00
Nick O'Leary
67da853146
Add info tips back to the sidebar
2017-04-07 11:21:30 +01:00
Nick O'Leary
624befd704
Restructure info tab
2017-04-06 23:17:30 +01:00
Nick O'Leary
262db23f7d
First pass of new node-info style
2017-04-05 16:19:23 +01:00
Nick O'Leary
b9379f2ddf
Provide notification when new flows deployed in the background
2017-03-17 21:29:03 +00:00
Kazuki-Nakanishi
38a950a6dc
Add description to flow same as subflow
2017-03-17 01:29:19 +09:00
Nick O'Leary
fb24dca019
Add JSON Expression editor
2017-03-12 23:52:31 +00:00
Nick O'Leary
bd4c578230
NLS messages for Flow enabled/disable
2017-03-06 15:55:38 +00:00
Nick O'Leary
6ec2949b6f
Don't display port labels for subflow pseudo-port nodes
2017-03-06 15:41:19 +00:00
Nick O'Leary
1ff23ebfd9
Stop some ui elements from clearing url anchor when clicked
2017-03-06 15:30:42 +00:00
Nick O'Leary
17e092afb3
Allow tabs to be enabled/disabled in the editor
2017-03-06 15:29:05 +00:00
Nick O'Leary
73501f3ad3
Resync with master
2017-03-01 17:45:09 +00:00
Dave Conway-Jones
424e854778
clipboard export text stay highlighted even when button deselected
...
i.e. if you hit button twice text stays selected.
2017-02-28 22:54:13 +00:00
Dave Conway-Jones
f5e6ca3e10
ensure export clipboard keeps text selected and formatted
2017-02-28 21:50:09 +00:00
Nick O'Leary
16c92cc739
Merge pull request #1156 from LinusU/patch-1
...
Use pre-calculated values for connection path
2017-02-28 10:10:12 +00:00
Nick O'Leary
e2a9be9cec
Defer resizing tray components until they have finished building
2017-02-16 21:41:20 +00:00
Linus Unnebäck
37dd075309
Use pre-calculated values for connection path
2017-02-16 18:05:59 +01:00
Linus Unnebäck
b24fac3dd8
Use textContent to avoid manual escaping
2017-02-16 16:28:00 +01:00
Nick O'Leary
5f1e37b7fa
Leave a node to nls its own port labels
2017-02-10 22:10:53 +00:00
Nick O'Leary
ec0209b175
Allow a node to override default labels
2017-02-09 23:24:16 +00:00
Nick O'Leary
fbd159a23a
Add placeholder text on label inputs and clear buttons
2017-02-08 10:48:26 +00:00
Nick O'Leary
599a6bf050
Add port labels to Subflow nodes
2017-02-08 10:48:25 +00:00
Nick O'Leary
185b16a858
Keep port label form in sync with output reordering
2017-02-08 10:48:25 +00:00
Nick O'Leary
e7e3ed4923
Basic node label editor
2017-02-08 10:48:25 +00:00
Nick O'Leary
47df5476ba
Add RED.stack as a common ui component
2017-02-08 10:48:25 +00:00
Nick O'Leary
d7c516ab00
Port label editor starting point
2017-02-08 10:48:24 +00:00
Nick O'Leary
50017c28da
Allow port labels be i18n identifiers
2017-01-27 22:36:00 +00:00
Nick O'Leary
85b2a03a42
Create a package.json file in userDir if one doesn't exist
2017-01-27 22:35:17 +00:00
Nick O'Leary
829087550d
Add inputLabels and outputLabels to node defn + Update Change node
2017-01-27 18:11:25 +00:00
Nick O'Leary
dd6f71fe85
Resize port labels based on content
2017-01-27 16:33:11 +00:00
Nick O'Leary
92a928680c
Initial port label behaviour
2017-01-26 15:38:25 +00:00
Nick O'Leary
4affbb8c6b
Numeric validator that accepts blank should accept undefined
2017-01-25 16:11:56 +00:00
Nick O'Leary
a69683183f
Refuse to update a non-local node module
2017-01-24 22:50:40 +00:00
Nick O'Leary
128c4fe222
Add visual cue as to whether the workspace is focused
2017-01-24 16:14:03 +00:00
Nick O'Leary
68e0b35364
Allow RED.validators.number to allow blank values as valid
2017-01-24 14:28:15 +00:00
Nick O'Leary
3fdeb38bb7
Ensure auth-tokens are removed when no user is specified in settings
2017-01-21 23:49:20 +00:00
Nick O'Leary
e27f5d0460
Add node module update api and expose in palette editor
2017-01-21 23:46:44 +00:00
Nick O'Leary
0720128bd4
Support dropping json files into the editor
2017-01-19 15:34:14 +00:00
Nick O'Leary
540472a093
Ensure all a tags have blank target in info sidebar
2017-01-19 13:52:38 +00:00
Nick O'Leary
daca78b6cd
Ensure links do not span tabs in the editor
2017-01-19 13:24:54 +00:00
Dave Conway-Jones
4195840b2c
make links in added info open in blank page rather than current window
2017-01-19 11:00:22 +00:00
Nick O'Leary
b8888a5d46
Add RED.utils.getNodeLabel utility function
2017-01-18 15:52:09 +00:00
Nick O'Leary
11f4ae019c
Include module name in requests for node icons
2017-01-18 13:06:22 +00:00
Nick O'Leary
0646b0060e
Display buffer data properly for truncated buffers under Object property
2017-01-16 17:43:39 +00:00
Nick O'Leary
5b4019dd3d
Add colour swatches to debug when hex colour matched
2017-01-16 10:29:00 +00:00
Nick O'Leary
a03ccd7b59
Nodes with hasUsers set to false should not appear unused
2017-01-15 13:37:21 +00:00
Nick O'Leary
f462435dc2
Do not look for existing nodes when checking for wires on paste
...
Fixes #1114
2017-01-13 14:16:12 +00:00
Nick O'Leary
0a96259ddf
Update copyright header for JS Foundation
2017-01-11 15:24:33 +00:00
Nick O'Leary
64d261e053
Add deploy action
2017-01-11 14:33:40 +00:00
Nick O'Leary
eb027d98aa
Add column headings to keymap table
2017-01-11 14:15:29 +00:00
Nick O'Leary
a95727b654
Scope input/export actions to be global
2017-01-11 14:15:14 +00:00
Nick O'Leary
4e636d7eec
Fix arg passing lint error
2017-01-11 12:18:52 +00:00
Nick O'Leary
3cd53f617a
Include unassigned keys to shortcut dialog
2017-01-11 11:41:25 +00:00
Nick O'Leary
b1684e82d8
Dynamically generate keyboard shortcut help dialog
2017-01-11 11:35:48 +00:00
Nick O'Leary
f248699a30
Display info tips slightly longer
2017-01-09 22:09:06 +00:00
Nick O'Leary
29594726ca
Speed up reveal of search dialogs
2017-01-09 22:08:54 +00:00
Nick O'Leary
0a41b07297
Reorder Debug/Inject nodes in quick-add dialog
2017-01-09 16:41:16 +00:00
Nick O'Leary
a1eeff4034
Node status not being refreshed properly in the editor
2017-01-09 14:18:59 +00:00
Nick O'Leary
0e1013a570
Add install/remove dialog to increase friction
...
Closes #1109
2017-01-09 13:41:20 +00:00
Nick O'Leary
4562b06a60
Try to prevent auto-fill of password fields in node edit tray
...
Fixes #1081
2017-01-08 23:14:14 +00:00
Nick O'Leary
1e37fed90b
Report node catalogue load errors
...
Closes #1009
2017-01-08 20:51:31 +00:00
Nick O'Leary
aafcfef387
Add property validation to nodes using typedInput
2017-01-06 23:18:50 +00:00
Nick O'Leary
4b83d8160f
Add common validator for typedInput fields
...
Closes #1104
2017-01-06 22:20:09 +00:00
Nick O'Leary
73a41707e5
Property expressions must not be blank
2017-01-06 21:58:17 +00:00
Nick O'Leary
c989c533e8
Properly report module remove errors in palette editor
...
Fixes #1043
2017-01-06 16:53:54 +00:00
Nick O'Leary
4c6157a06e
Tidy up merge commit of validatePropertyExpression
2017-01-06 14:32:37 +00:00
Nick O'Leary
e73216d4c1
Merge branch 'master' into 0.16
2017-01-06 14:30:13 +00:00
Dave Conway-Jones
e6de26736b
add port if wires array > number of ports declared.
2017-01-06 14:06:30 +00:00
Nick O'Leary
d131addd63
Allow tips to be enabled/disabled via menu option
2017-01-06 13:33:23 +00:00
Nick O'Leary
0c7705beff
Allow quoted property expressions
...
Fixes #1101
2017-01-06 11:23:53 +00:00
Nick O'Leary
555f96cfaf
Info-tips update
2017-01-05 23:33:19 +00:00
Nick O'Leary
59ffacb3df
Fix merge conflicts
2017-01-05 10:07:23 +00:00
Nick O'Leary
83acb66f00
NLS the diff dialog
2017-01-04 22:02:35 +00:00
Nick O'Leary
ffa628be2d
Index all node properties for node search
2017-01-04 16:46:36 +00:00
Nick O'Leary
215c8fd261
NLS type search
2017-01-01 22:14:33 +00:00
Nick O'Leary
061cc908a7
Hide common entries when filtering typeSearch
2017-01-01 21:59:09 +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
bba3ca8cc0
Avoid misinterpreting valid objects as encoded arrays in debug
2016-12-20 22:46:56 +00:00
Nick O'Leary
226ad3fe22
Add missing diff file
2016-12-07 13:51:20 +00:00
Nick O'Leary
a9b17e930c
Add diff markers to tabs in diff-view
2016-12-07 13:48:30 +00:00
