You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/06/23 12:46:09 UTC
[6/6] incubator-ignite git commit: Merge branch 'ignite-843' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Merge branch 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/196710a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/196710a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/196710a6
Branch: refs/heads/ignite-843
Commit: 196710a6f1c7b9157f7f012fe1d1b6824485ad54
Parents: 8c2fdae 94ff76b
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Jun 23 13:45:20 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Jun 23 13:45:20 2015 +0300
----------------------------------------------------------------------
modules/webconfig/nodejs/db.js | 27 +++-
.../nodejs/public/form-models/caches.json | 143 +++++++++++++++++++
.../nodejs/public/form-models/clusters.json | 20 +--
.../public/javascripts/controllers/caches.js | 21 +++
.../public/javascripts/controllers/clusters.js | 6 +
.../public/javascripts/controllers/common.js | 4 +-
.../nodejs/public/stylesheets/style.css | 2 +-
.../nodejs/public/stylesheets/style.less | 27 +++-
modules/webconfig/nodejs/views/caches.jade | 4 +-
modules/webconfig/nodejs/views/clusters.jade | 2 +-
.../nodejs/views/includes/controls.jade | 22 ++-
.../webconfig/nodejs/views/includes/header.jade | 2 +-
12 files changed, 259 insertions(+), 21 deletions(-)
----------------------------------------------------------------------