Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c6264d6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c6264d6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c6264d6 Branch: refs/heads/ignite-843-rc1 Commit: 1c6264d63428881cd0bf4b775ae077c638740f1f Parents: 5e3392e e254cdf Author: Andrey <[email protected]> Authored: Thu Oct 15 14:52:13 2015 +0700 Committer: Andrey <[email protected]> Committed: Thu Oct 15 14:52:13 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/metadata-controller.js | 6 ++-- .../main/js/routes/generator/generator-java.js | 8 ++++-- .../main/js/routes/generator/generator-xml.js | 29 +++++++++++++------- .../src/main/js/views/index.jade | 2 +- .../src/main/js/views/templates/layout.jade | 6 ++-- 5 files changed, 32 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1c6264d6/modules/control-center-web/src/main/js/views/templates/layout.jade ----------------------------------------------------------------------
