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/10 03:18:57 UTC
[2/3] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Merge remote-tracking branch 'origin/ignite-843' 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/8465af56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8465af56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8465af56
Branch: refs/heads/ignite-843
Commit: 8465af564cec8b8e4af3152459a34e8d71b43708
Parents: 3a1eba2 87be527
Author: Andrey <an...@gridgain.com>
Authored: Thu Jul 9 18:31:15 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jul 9 18:31:15 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/app.js | 3 +-
.../nodejs/controllers/admin-controller.js | 42 ++++++++++++++------
.../nodejs/controllers/models/caches.json | 2 +-
.../nodejs/controllers/profile-controller.js | 28 +++++++++++--
.../web-control-center/nodejs/routes/profile.js | 38 +++++++++++++++---
.../nodejs/views/admin/userList.jade | 5 +--
.../web-control-center/nodejs/views/index.jade | 1 +
.../web-control-center/nodejs/views/login.jade | 11 +++--
.../nodejs/views/profile.jade | 13 +++++-
9 files changed, 110 insertions(+), 33 deletions(-)
----------------------------------------------------------------------