You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/02/22 17:19:15 UTC
[19/28] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Merge branch 'develop' of http://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/bf97094b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/bf97094b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/bf97094b
Branch: refs/heads/nifi-site-to-site-client
Commit: bf97094b8c06c476401ee517e7b4c5e5deb59e12
Parents: ff6e5e6 b37d8fb
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Feb 13 07:20:19 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Feb 13 07:20:19 2015 -0500
----------------------------------------------------------------------
README.md | 6 +-
nifi-site/src/includes/topbar.hbs | 1 +
nifi-site/src/pages/html/screencasts.hbs | 35 ++++++
.../src/main/webapp/js/nf/canvas/nf-actions.js | 2 -
.../webapp/js/nf/canvas/nf-canvas-toolbox.js | 56 ++++++----
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 25 +++--
.../main/webapp/js/nf/canvas/nf-connectable.js | 111 ++++++++++++-------
.../src/main/webapp/js/nf/canvas/nf-graph.js | 6 +-
9 files changed, 173 insertions(+), 71 deletions(-)
----------------------------------------------------------------------