Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c62aba13 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c62aba13 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c62aba13 Branch: refs/heads/NIFI-250 Commit: c62aba1336f0a77d9baae8ba261877d959bf97bb Parents: 210a21c 5fe4c15 Author: Mark Payne <[email protected]> Authored: Wed Jan 14 12:22:10 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Wed Jan 14 12:22:10 2015 -0500 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-birdseye.js | 4 ++ .../webapp/js/nf/canvas/nf-canvas-toolbox.js | 4 ++ .../src/main/webapp/js/nf/canvas/nf-canvas.js | 12 ++++-- .../main/webapp/js/nf/canvas/nf-context-menu.js | 8 ++++ .../webapp/js/nf/canvas/nf-graph-control.js | 40 ++++++++++++++++---- .../src/main/webapp/js/nf/canvas/nf-search.js | 3 ++ .../webapp/js/nf/canvas/nf-toolbar-action.js | 4 ++ 7 files changed, 64 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
