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 2015/07/23 10:40:35 UTC
[04/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-1121' and 'ignite-843' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1121
Merge branches 'ignite-1121' and 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01bc127c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01bc127c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01bc127c
Branch: refs/heads/ignite-1121
Commit: 01bc127c9a3bb8163d089f87e3a48ed2b2b4243b
Parents: 91f1fdc 85062e3
Author: Andrey <an...@gridgain.com>
Authored: Mon Jul 20 17:57:24 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Jul 20 17:57:24 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/admin-controller.js | 12 +-
.../controllers/cache-viewer-controller.js | 2 +-
.../nodejs/controllers/caches-controller.js | 128 ++++++-----
.../nodejs/controllers/clusters-controller.js | 66 +++++-
.../nodejs/controllers/common-module.js | 220 ++++++++++++++-----
.../nodejs/controllers/metadata-controller.js | 170 +++++++++++---
.../nodejs/controllers/models/caches.json | 2 +
.../nodejs/controllers/models/metadata.json | 54 +++--
.../nodejs/controllers/profile-controller.js | 6 +-
.../nodejs/controllers/summary-controller.js | 44 ++--
modules/web-control-center/nodejs/db.js | 5 +-
modules/web-control-center/nodejs/package.json | 22 +-
.../nodejs/public/stylesheets/style.less | 55 ++++-
.../nodejs/routes/generator/java.js | 4 +-
.../nodejs/routes/generator/xml.js | 14 +-
.../web-control-center/nodejs/routes/public.js | 5 +
.../web-control-center/nodejs/routes/summary.js | 12 +-
.../nodejs/views/configuration/summary.jade | 8 +-
.../nodejs/views/includes/controls.jade | 157 ++++++++-----
19 files changed, 685 insertions(+), 301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01bc127c/modules/web-control-center/nodejs/package.json
----------------------------------------------------------------------