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/06/06 05:40:02 UTC
[1/2] incubator-nifi git commit: NIFI-661: - Fixing issue which
caused the invalid icon from wrapping in Firefox.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 63bdda4b5 -> 245fef4ee
NIFI-661:
- Fixing issue which caused the invalid icon from wrapping in Firefox.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6324442a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6324442a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6324442a
Branch: refs/heads/develop
Commit: 6324442acf77be1a9dd677bba0c44d2061cb9af2
Parents: 73b08d8
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Jun 5 16:08:46 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Jun 5 16:08:46 2015 -0400
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6324442a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.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-settings.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index c7b2b65..d323892 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -599,9 +599,9 @@ nf.Settings = (function () {
// more details formatter
var moreControllerServiceDetails = function (row, cell, value, columnDef, dataContext) {
- var markup = '<img src="images/iconDetails.png" title="View Details" class="pointer view-controller-service" style="margin-top: 5px; float: left;" /> ';
+ var markup = '<img src="images/iconDetails.png" title="View Details" class="pointer view-controller-service" style="margin-top: 5px; float: left;" />';
if (!nf.Common.isEmpty(dataContext.validationErrors)) {
- markup += '<img src="images/iconAlert.png" class="has-errors" style="margin-top: 4px; float: left;" /><span class="hidden row-id">' + nf.Common.escapeHtml(dataContext.id) + '</span>';
+ markup += '<img src="images/iconAlert.png" class="has-errors" style="margin-top: 4px; margin-left: 4px; float: left;" /><span class="hidden row-id">' + nf.Common.escapeHtml(dataContext.id) + '</span>';
}
return markup;
};
@@ -1197,9 +1197,9 @@ nf.Settings = (function () {
initNewReportingTaskDialog();
var moreReportingTaskDetails = function (row, cell, value, columnDef, dataContext) {
- var markup = '<img src="images/iconDetails.png" title="View Details" class="pointer view-reporting-task" style="margin-top: 5px; float: left;" /> ';
+ var markup = '<img src="images/iconDetails.png" title="View Details" class="pointer view-reporting-task" style="margin-top: 5px; float: left;" />';
if (!nf.Common.isEmpty(dataContext.validationErrors)) {
- markup += '<img src="images/iconAlert.png" class="has-errors" style="margin-top: 4px; float: left;" /><span class="hidden row-id">' + nf.Common.escapeHtml(dataContext.id) + '</span>';
+ markup += '<img src="images/iconAlert.png" class="has-errors" style="margin-top: 4px; margin-left: 4px; float: left" /><span class="hidden row-id">' + nf.Common.escapeHtml(dataContext.id) + '</span>';
}
return markup;
};
[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/245fef4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/245fef4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/245fef4e
Branch: refs/heads/develop
Commit: 245fef4ee2728bdb6f69106853ed865540cd5bb5
Parents: 6324442 63bdda4
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Jun 5 23:38:59 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Jun 5 23:38:59 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/nifi/controller/FlowFileQueue.java | 9 +++++++++
.../apache/nifi/controller/StandardFlowFileQueue.java | 13 +++++++++----
.../apache/nifi/connectable/StandardConnection.java | 4 ++++
3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------