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/16 10:14:30 UTC
[11/12] 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/e4b80ca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4b80ca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4b80ca1
Branch: refs/heads/ignite-1121
Commit: e4b80ca134e5754010474883f2d71a66281b37cf
Parents: 2e814bd 400bc56
Author: Andrey <an...@gridgain.com>
Authored: Thu Jul 16 15:14:14 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jul 16 15:14:14 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/.gitignore | 3 +-
.../nodejs/controllers/admin-controller.js | 80 ++++++++---------
.../nodejs/controllers/caches-controller.js | 89 +++++++++++++------
.../nodejs/controllers/clusters-controller.js | 93 ++++++++++++++------
.../nodejs/controllers/common-module.js | 43 +++++++--
.../nodejs/controllers/summary-controller.js | 2 +-
.../nodejs/public/stylesheets/sql-console.css | 72 ---------------
.../nodejs/public/stylesheets/style.css | 1 -
.../nodejs/public/stylesheets/style.less | 29 +++---
.../web-control-center/nodejs/routes/admin.js | 2 +-
.../web-control-center/nodejs/routes/caches.js | 16 ++--
.../nodejs/routes/clusters.js | 16 ++--
.../nodejs/routes/generator/java.js | 3 -
.../nodejs/routes/generator/xml.js | 14 +++
.../nodejs/routes/metadata.js | 16 ++--
.../nodejs/routes/persistence.js | 16 ++--
.../web-control-center/nodejs/routes/public.js | 9 +-
.../web-control-center/nodejs/routes/summary.js | 18 ++--
.../nodejs/views/configuration/caches.jade | 3 +-
.../nodejs/views/configuration/clusters.jade | 5 +-
.../nodejs/views/configuration/metadata.jade | 2 +-
.../nodejs/views/configuration/summary.jade | 2 +-
.../nodejs/views/includes/controls.jade | 14 +--
.../nodejs/views/settings/profile.jade | 2 +-
.../nodejs/views/templates/confirm.jade | 4 +-
.../nodejs/views/templates/saveAs.jade | 31 +++++++
26 files changed, 347 insertions(+), 238 deletions(-)
----------------------------------------------------------------------