You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/03 08:20:46 UTC

[1/2] ignite git commit: IGNITE-843 Minor ui fix.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 d74c2f46a -> d055f6498


IGNITE-843 Minor ui fix.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11b5754e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11b5754e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11b5754e

Branch: refs/heads/ignite-843-rc2
Commit: 11b5754e27e3d2f2ec3d6458d91c466bc0cca65c
Parents: f146e41
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 3 14:20:10 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 3 14:20:10 2016 +0700

----------------------------------------------------------------------
 modules/control-center-web/src/main/js/views/sql/sql.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/11b5754e/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 75e1c90..ca5ab1c 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -120,8 +120,8 @@ mixin chart-settings(mdl)
                                     hr(style='margin: 0')
                                 .col-sm-12
                                     .sql-controls
-                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, true)' ng-click='actionAvailable(paragraph, true) ? explain(paragraph) : ""' data-placement='bottom' bs-tooltip data-title='{{actionTooltip(paragraph, "explain", true)}}') Explain
                                         a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, true)' ng-click='actionAvailable(paragraph, true) ? execute(paragraph) : ""' data-placement='bottom' bs-tooltip data-title='{{actionTooltip(paragraph, "execute", true)}}') Execute
+                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, true)' ng-click='actionAvailable(paragraph, true) ? explain(paragraph) : ""' data-placement='bottom' bs-tooltip data-title='{{actionTooltip(paragraph, "explain", true)}}') Explain
                                         a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, false)' ng-click='actionAvailable(paragraph, false) ? scan(paragraph): ""' data-placement='bottom' bs-tooltip data-title='{{actionTooltip(paragraph, "execute scan", false)}}') Scan
                                         .pull-right
                                             labelHide System columns:


[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d055f649
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d055f649
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d055f649

Branch: refs/heads/ignite-843-rc2
Commit: d055f6498646bc3e97ccbd356fd133b6dd1cf338
Parents: 11b5754 d74c2f4
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 3 14:20:43 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 3 14:20:43 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/data/getting-started.json   |  13 +++--
 .../app/modules/Form/group/group.directive.js   |   6 ++-
 .../main/js/controllers/clusters-controller.js  |   6 +++
 .../main/js/helpers/generator/generator-java.js |  51 +++++++++++++++----
 .../src/main/js/public/images/apache-ignite.png | Bin 540262 -> 0 bytes
 .../src/main/js/public/images/ignite-puzzle.png | Bin 0 -> 540262 bytes
 .../src/main/js/routes/caches.js                |  12 +++++
 .../src/main/js/routes/clusters.js              |  18 +++++--
 .../src/main/js/routes/domains.js               |  10 ++--
 9 files changed, 93 insertions(+), 23 deletions(-)
----------------------------------------------------------------------