You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/09 13:35:34 UTC
[1/2] incubator-nifi git commit: Treating description as HTML as it
has been properly escaped when added to the SlickGrid DataView
Repository: incubator-nifi
Updated Branches:
refs/heads/develop f66545145 -> 0133f8471
Treating description as HTML as it has been properly escaped when added to the SlickGrid DataView
Signed-off-by: Matt Gilman <ma...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1dc879c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1dc879c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1dc879c1
Branch: refs/heads/develop
Commit: 1dc879c131834682aa2cd26236e26d1bf738e855
Parents: d36a71c
Author: Aldrin Piri <al...@gmail.com>
Authored: Sun Feb 8 21:37:20 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Feb 9 07:31:15 2015 -0500
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1dc879c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
index ee91107..8d005e2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
@@ -975,7 +975,7 @@ nf.CanvasToolbox = (function () {
if (nf.Common.isBlank(processorType.description)) {
$('#processor-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else {
- $('#processor-type-description').text(processorType.description).ellipsis();
+ $('#processor-type-description').html(processorType.description).ellipsis();
}
// populate the dom
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by mc...@apache.org.
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/0133f847
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0133f847
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0133f847
Branch: refs/heads/develop
Commit: 0133f8471864efc0c316048b5a26e9d12351bab9
Parents: 1dc879c f665451
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Feb 9 07:31:25 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Feb 9 07:31:25 2015 -0500
----------------------------------------------------------------------
nifi/LICENSE | 25 +-
nifi/nifi-assembly/LICENSE | 23 +
nifi/nifi-docs/LICENSE | 235 +++++++++++
nifi/nifi-docs/NOTICE | 5 +
nifi/nifi-docs/pom.xml | 30 +-
.../src/main/asciidoc/asciidoc-mod.css | 418 +++++++++++++++++++
.../src/main/asciidoc/developer-guide.adoc | 32 +-
.../src/main/assembly/dependencies.xml | 16 +
nifi/pom.xml | 4 +-
9 files changed, 760 insertions(+), 28 deletions(-)
----------------------------------------------------------------------