ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [2/5] ignite git commit: Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Date Thu, 18 Feb 2016 09:39:18 GMT
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97bbe609
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97bbe609
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97bbe609

Branch: refs/heads/ignite-2612
Commit: 97bbe609c5946960faa4ce6a66493a4564c2bfd0
Parents: 68fd50f 3655140
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Thu Feb 18 15:19:00 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Feb 18 15:19:00 2016 +0700

----------------------------------------------------------------------
 .../bin/ignite-web-agent.bat                    |   2 +-
 .../bin/ignite-web-agent.sh                     |   2 +-
 modules/control-center-web/DEVNOTES.txt         |  10 +-
 .../control-center-web/src/main/js/.eslintrc    |   2 +-
 .../src/main/js/app/decorator/select.js         |  67 +++
 .../form-field-java-class.jade                  |  10 +-
 .../control-center-web/src/main/js/app/index.js |   4 +-
 .../js/app/modules/form/field/input/number.jade |   2 +-
 .../states/configuration/clusters/binary.jade   |  33 +-
 .../configuration/clusters/deployment.jade      |  16 +-
 .../configuration/clusters/discovery.jade       |   1 -
 .../states/configuration/clusters/igfs.jade     |   2 +-
 .../configuration/summary/summary.controller.js |   9 +-
 .../main/js/app/modules/states/login/index.js   |  12 +-
 .../main/js/app/modules/user/Auth.service.js    |   2 +-
 .../main/js/app/modules/user/User.service.js    |   2 +-
 .../js/app/services/cleanup/cleanup.service.js  |   3 +-
 .../control-center-web/src/main/js/config.js    |  45 +-
 .../src/main/js/controllers/admin-controller.js |   5 +
 .../main/js/controllers/caches-controller.js    |  10 +-
 .../main/js/controllers/clusters-controller.js  |  21 +-
 .../src/main/js/controllers/common-module.js    |  17 +-
 .../main/js/controllers/domains-controller.js   |  25 +-
 .../src/main/js/controllers/igfs-controller.js  |  15 +-
 .../src/main/js/controllers/sql-controller.js   |   4 +-
 .../src/main/js/gulpfile.js/tasks/eslint.js     |  16 +-
 .../js/helpers/generator/generator-common.js    |   5 +-
 .../js/helpers/generator/generator-docker.js    |  10 +-
 .../main/js/helpers/generator/generator-java.js | 130 +++--
 .../main/js/helpers/generator/generator-pom.js  |   2 +-
 .../main/js/helpers/generator/generator-xml.js  |  60 +-
 .../control-center-web/src/main/js/package.json |  16 +-
 .../src/main/js/public/stylesheets/style.scss   |  17 +
 modules/control-center-web/src/main/js/serve.js |   4 +-
 .../src/main/js/serve/agent.js                  | 550 ++++++++++---------
 .../control-center-web/src/main/js/serve/app.js |   6 +-
 .../src/main/js/serve/configure.js              |  25 +-
 .../src/main/js/serve/mail.js                   |  71 +++
 .../src/main/js/serve/mongo.js                  |  90 +--
 .../src/main/js/serve/routes/admin.js           | 126 ++---
 .../src/main/js/serve/routes/agent.js           | 207 +++----
 .../src/main/js/serve/routes/caches.js          | 222 +++-----
 .../src/main/js/serve/routes/clusters.js        | 221 ++++----
 .../src/main/js/serve/routes/domains.js         | 347 +++++-------
 .../src/main/js/serve/routes/igfs.js            | 166 +++---
 .../src/main/js/serve/routes/notebooks.js       | 136 ++---
 .../src/main/js/serve/routes/profile.js         | 100 ++--
 .../src/main/js/serve/routes/public.js          | 265 ++++-----
 .../src/main/js/serve/routes/routes.js          |  25 +-
 .../src/main/js/serve/settings.js               |  13 +-
 .../main/js/views/configuration/clusters.jade   |   4 +-
 .../js/views/configuration/domains-import.jade  |  15 +-
 .../src/main/js/views/configuration/igfs.jade   |   1 +
 .../src/main/js/views/login.jade                | 157 ------
 .../src/main/js/views/settings/admin.jade       |  73 +--
 .../src/main/js/views/settings/profile.jade     |   8 +-
 .../src/main/js/views/signin.jade               | 158 ++++++
 .../src/main/js/views/sql/cache-metadata.jade   |   4 +-
 .../src/main/js/views/sql/sql.jade              |   4 +-
 59 files changed, 1790 insertions(+), 1785 deletions(-)
----------------------------------------------------------------------



Mime
View raw message