Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 981A818B68 for ; Fri, 31 Jul 2015 07:47:12 +0000 (UTC) Received: (qmail 86308 invoked by uid 500); 31 Jul 2015 07:47:12 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 86275 invoked by uid 500); 31 Jul 2015 07:47:12 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 86266 invoked by uid 99); 31 Jul 2015 07:47:12 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 07:47:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 00152195B60 for ; Fri, 31 Jul 2015 07:47:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 8y1M8g0okimQ for ; Fri, 31 Jul 2015 07:46:53 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id C72E650613 for ; Fri, 31 Jul 2015 07:46:44 +0000 (UTC) Received: (qmail 83747 invoked by uid 99); 31 Jul 2015 07:46:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 07:46:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 27F0CE6839; Fri, 31 Jul 2015 07:46:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 31 Jul 2015 07:46:53 -0000 Message-Id: <1c8f168b1b0a4d73b20d7299881c8185@git.apache.org> In-Reply-To: <8668856204024eccba84d17ea8a87232@git.apache.org> References: <8668856204024eccba84d17ea8a87232@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/50] incubator-ignite git commit: Merge branch 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1121 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-1155_1 Commit: 49bf1e26706f7b5451c7b40ec5f9059bfd00d016 Parents: f58d813 ce7ab19 Author: Andrey Authored: Tue Jul 28 10:56:53 2015 +0700 Committer: Andrey 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 ----------------------------------------------------------------------