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/49bf1e26 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49bf1e26 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49bf1e26 Branch: refs/heads/ignite-843 Commit: 49bf1e26706f7b5451c7b40ec5f9059bfd00d016 Parents: f58d813 ce7ab19 Author: Andrey <anovi...@gridgain.com> Authored: Tue Jul 28 10:56:53 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Jul 28 10:56:53 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 1 + .../src/main/js/controllers/common-module.js | 5 +- .../main/js/controllers/metadata-controller.js | 63 +++++----- .../main/js/controllers/models/metadata.json | 4 +- modules/web-control-center/src/main/js/db.js | 20 +++- .../web-control-center/src/main/js/package.json | 1 + .../src/main/js/routes/generator/common.js | 16 +++ .../src/main/js/routes/generator/xml.js | 114 +++++++++++++++++-- .../src/main/js/routes/summary.js | 2 +- .../src/main/js/views/configuration/caches.jade | 2 +- .../main/js/views/configuration/clusters.jade | 2 +- .../main/js/views/configuration/metadata.jade | 8 +- .../main/js/views/configuration/summary.jade | 27 +++-- .../src/main/js/views/includes/controls.jade | 44 ++++--- .../src/main/js/views/login.jade | 4 +- .../src/main/js/views/settings/admin.jade | 2 +- .../src/main/js/views/settings/profile.jade | 2 +- .../src/main/js/views/sql/sql.jade | 2 +- .../src/main/js/views/templates/confirm.jade | 6 +- .../src/main/js/views/templates/copy.jade | 8 +- .../src/main/js/views/templates/tab.jade | 2 +- 21 files changed, 237 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/49bf1e26/modules/web-control-center/src/main/js/package.json ----------------------------------------------------------------------
