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:56 UTC
[25/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-1121
Merge branch '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/6265e3ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6265e3ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6265e3ad
Branch: refs/heads/ignite-1121
Commit: 6265e3ad89ac88e89b1ae95c3828bea5e8b2066d
Parents: 573dd09 66e7328
Author: Andrey <an...@gridgain.com>
Authored: Wed Jul 22 09:00:58 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Jul 22 09:00:58 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/caches-controller.js | 14 +-
.../nodejs/controllers/clusters-controller.js | 10 +
.../nodejs/controllers/common-module.js | 7 +-
.../nodejs/controllers/metadata-controller.js | 181 ++++++++++++++++---
.../nodejs/controllers/models/clusters.json | 29 ++-
.../nodejs/controllers/models/metadata.json | 47 +++--
.../nodejs/controllers/profile-controller.js | 2 +-
.../nodejs/controllers/summary-controller.js | 26 +--
.../nodejs/public/stylesheets/style.less | 50 ++++-
.../nodejs/views/configuration/caches.jade | 6 +-
.../nodejs/views/configuration/clusters.jade | 8 +-
.../nodejs/views/configuration/metadata.jade | 18 +-
.../nodejs/views/configuration/summary.jade | 8 +-
.../nodejs/views/includes/controls.jade | 106 +++++++----
.../nodejs/views/settings/admin.jade | 11 +-
.../nodejs/views/settings/profile.jade | 2 +-
.../nodejs/views/sql/sql.jade | 2 +-
.../nodejs/views/templates/select.jade | 2 +-
18 files changed, 398 insertions(+), 131 deletions(-)
----------------------------------------------------------------------