You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/25 11:26:10 UTC
[4/4] ignite git commit: Merge branch 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fedd9b19
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fedd9b19
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fedd9b19
Branch: refs/heads/ignite-2612
Commit: fedd9b190c70b01d74c544ef0db34c244b3e5e26
Parents: b0d14b7 9aa0a57
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Feb 25 17:25:04 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Feb 25 17:25:04 2016 +0700
----------------------------------------------------------------------
.../app/directives/bs-affix-update.directive.js | 34 +++
.../bs-affix-update.directive.js | 34 ---
.../ui-ace-docker/ui-ace-docker.directive.js | 12 +-
.../directives/ui-ace-docker/ui-ace-docker.jade | 2 +-
.../ui-ace-java/ui-ace-java.directive.js | 12 +-
.../app/directives/ui-ace-java/ui-ace-java.jade | 2 +-
.../ui-ace-pojos/ui-ace-pojos.directive.js | 12 +-
.../directives/ui-ace-pojos/ui-ace-pojos.jade | 2 +-
.../ui-ace-pom/ui-ace-pom.directive.js | 12 +-
.../app/directives/ui-ace-pom/ui-ace-pom.jade | 2 +-
.../js/app/directives/ui-ace-tabs.directive.js | 25 ++
.../ui-ace-xml/ui-ace-xml.directive.js | 12 +-
.../app/directives/ui-ace-xml/ui-ace-xml.jade | 2 +-
.../app/directives/ui-ace/ui-ace.directive.js | 25 --
.../control-center-web/src/main/js/app/index.js | 9 +-
.../src/main/js/app/modules/ace.module.js | 266 +++++++++++++++++++
.../form/field/input/number.directive.js | 4 +
.../js/app/modules/form/field/input/number.jade | 1 +
.../states/configuration/clusters/atomic.jade | 2 +-
.../states/configuration/clusters/binary.jade | 2 +-
.../configuration/clusters/communication.jade | 2 +-
.../configuration/clusters/connector.jade | 2 +-
.../configuration/clusters/deployment.jade | 2 +-
.../configuration/clusters/discovery.jade | 2 +-
.../states/configuration/clusters/events.jade | 2 +-
.../states/configuration/clusters/general.jade | 2 +-
.../states/configuration/clusters/igfs.jade | 2 +-
.../configuration/clusters/marshaller.jade | 2 +-
.../states/configuration/clusters/metrics.jade | 2 +-
.../clusters/preview-panel.directive.js | 12 +-
.../states/configuration/clusters/ssl.jade | 2 +-
.../states/configuration/clusters/swap.jade | 2 +-
.../states/configuration/clusters/thread.jade | 2 +-
.../states/configuration/clusters/time.jade | 2 +-
.../configuration/clusters/transactions.jade | 4 +-
.../summary/summary-tabs.directive.js | 10 +-
.../control-center-web/src/main/js/config.js | 12 +-
.../src/main/js/controllers/common-module.js | 2 +-
.../src/main/js/controllers/sql-controller.js | 6 -
.../control-center-web/src/main/js/package.json | 6 -
.../main/js/views/configuration/summary.jade | 4 +-
.../src/main/js/views/sql/sql.jade | 2 +-
42 files changed, 408 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fedd9b19/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --cc modules/control-center-web/src/main/js/app/index.js
index c889a61,eb76256..35426f5
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@@ -81,11 -81,9 +81,11 @@@ import './modules/ace.module'
// endignite
// Directives.
+import igniteAdvancedOptionsHide from './directives/advanced-options/advanced-options-hide.directive';
+import igniteAdvancedOptionsToggle from './directives/advanced-options/advanced-options-toggle.directive';
import igniteLoading from './directives/loading/loading.directive';
import igniteInformation from './directives/information/information.directive';
- import igniteUiAce from './directives/ui-ace/ui-ace.directive';
+ import igniteUiAceTabs from './directives/ui-ace-tabs.directive';
import igniteUiAceXml from './directives/ui-ace-xml/ui-ace-xml.directive';
import igniteUiAceJava from './directives/ui-ace-java/ui-ace-java.directive';
import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive';
@@@ -132,11 -131,9 +133,11 @@@ angula
'ignite-console.version'
])
// Directives.
+.directive(...igniteAdvancedOptionsHide)
+.directive(...igniteAdvancedOptionsToggle)
.directive(...igniteLoading)
.directive(...igniteInformation)
- .directive(...igniteUiAce)
+ .directive(...igniteUiAceTabs)
.directive(...igniteUiAceXml)
.directive(...igniteUiAceJava)
.directive(...igniteUiAcePom)
http://git-wip-us.apache.org/repos/asf/ignite/blob/fedd9b19/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/atomic.jade
----------------------------------------------------------------------