ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [44/45] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-843' into ignite-1121
Date Wed, 15 Jul 2015 19:17:32 GMT
Merge remote-tracking branch 'remotes/origin/ignite-843' 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/3e9c9d8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3e9c9d8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3e9c9d8b

Branch: refs/heads/ignite-1121
Commit: 3e9c9d8bcd1894787bc51bdb72738f806d5fc09d
Parents: 9ab35ff 3abac23
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Wed Jul 15 19:32:38 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Wed Jul 15 19:32:38 2015 +0300

----------------------------------------------------------------------
 modules/web-control-center/nodejs/DEVNOTES.txt  |   4 +-
 modules/web-control-center/nodejs/app.js        |  25 +--
 .../nodejs/controllers/admin-controller.js      |  42 ++---
 .../nodejs/controllers/caches-controller.js     | 108 ++++++++++--
 .../nodejs/controllers/clusters-controller.js   |  35 ++--
 .../nodejs/controllers/common-module.js         |  59 ++++++-
 .../nodejs/controllers/metadata-controller.js   | 123 ++++++++++----
 .../nodejs/controllers/models/caches.json       |  34 ++--
 .../nodejs/controllers/models/clusters.json     |  66 ++++----
 .../nodejs/controllers/models/metadata.json     | 169 ++++++++++++++++++-
 .../nodejs/controllers/models/summary.json      | 150 ++++++++++++++++
 .../nodejs/controllers/profile-controller.js    |  12 +-
 .../nodejs/controllers/summary-controller.js    | 137 ++++++++++++---
 modules/web-control-center/nodejs/db.js         |  30 +++-
 .../nodejs/helpers/ui-utils.js                  |  29 ----
 .../nodejs/public/stylesheets/style.css         |   2 +-
 .../nodejs/public/stylesheets/style.less        |  84 +++++++--
 .../web-control-center/nodejs/routes/admin.js   |  47 +++---
 .../web-control-center/nodejs/routes/caches.js  |  14 +-
 .../nodejs/routes/clusters.js                   |  16 +-
 .../nodejs/routes/generator/common.js           |   4 +
 .../nodejs/routes/generator/java.js             |  62 ++++---
 .../nodejs/routes/generator/xml.js              |  32 ++--
 .../nodejs/routes/metadata.js                   |  14 +-
 .../nodejs/routes/persistence.js                | 147 ++++++++--------
 .../web-control-center/nodejs/routes/profile.js |  11 +-
 .../web-control-center/nodejs/routes/public.js  |  27 +--
 modules/web-control-center/nodejs/routes/sql.js |   2 -
 .../web-control-center/nodejs/routes/summary.js |  47 ++++--
 .../nodejs/views/configuration/caches.jade      |   6 +-
 .../nodejs/views/configuration/clusters.jade    |   6 +-
 .../nodejs/views/configuration/metadata.jade    |  95 ++++++++++-
 .../nodejs/views/configuration/persistence.jade |   2 +-
 .../nodejs/views/configuration/sidebar.jade     |  14 +-
 .../nodejs/views/configuration/summary.jade     | 140 +++++++++------
 .../nodejs/views/includes/controls.jade         |  99 ++++++++---
 .../nodejs/views/includes/header.jade           |  27 +--
 .../nodejs/views/settings/admin.jade            |  39 ++---
 .../nodejs/views/templates/confirm.jade         |  27 +++
 .../nodejs/views/templates/headers.jade         |  55 ------
 .../nodejs/views/templates/layout.jade          |  46 ++++-
 .../nodejs/views/templates/select.jade          |   4 +-
 42 files changed, 1475 insertions(+), 617 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e9c9d8b/modules/web-control-center/nodejs/app.js
----------------------------------------------------------------------
diff --cc modules/web-control-center/nodejs/app.js
index 8d05810,c9b79ab..a08ad17
--- a/modules/web-control-center/nodejs/app.js
+++ b/modules/web-control-center/nodejs/app.js
@@@ -34,10 -34,7 +34,8 @@@ var summary = require('./routes/summary
  var adminRouter = require('./routes/admin');
  var profileRouter = require('./routes/profile');
  var sqlRouter = require('./routes/sql');
 +var bridge = require('./bridge/bridge');
  
- var uiUtils = require('./helpers/ui-utils');
- 
  var passport = require('passport');
  
  var db = require('./db');


Mime
View raw message