Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/85062e30 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/85062e30 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/85062e30 Branch: refs/heads/ignite-1121 Commit: 85062e304840bf8865a253c8fed3c91f40de961b Parents: 94b581f 36cfaad Author: Andrey <anovi...@gridgain.com> Authored: Mon Jul 20 17:56:12 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Jul 20 17:56:12 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/common-module.js | 11 ++- .../nodejs/controllers/metadata-controller.js | 88 ++++++++++++++++++++ .../nodejs/controllers/models/metadata.json | 41 +++++---- .../nodejs/controllers/summary-controller.js | 2 +- modules/web-control-center/nodejs/db.js | 4 +- .../nodejs/public/stylesheets/style.less | 20 +++++ .../nodejs/views/includes/controls.jade | 45 +++++++++- 7 files changed, 185 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
