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 C1A0E180BD for ; Wed, 18 Nov 2015 06:35:42 +0000 (UTC) Received: (qmail 17262 invoked by uid 500); 18 Nov 2015 06:35:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17226 invoked by uid 500); 18 Nov 2015 06:35:42 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 17217 invoked by uid 99); 18 Nov 2015 06:35:42 -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; Wed, 18 Nov 2015 06:35:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 875F4DFF1D; Wed, 18 Nov 2015 06:35:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Message-Id: <638670ce20ed4779953fc96037fadaba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-843 Changed version of angular-strap. Date: Wed, 18 Nov 2015 06:35:42 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 4a5445107 -> 85d78e387 IGNITE-843 Changed version of angular-strap. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85d78e38 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85d78e38 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85d78e38 Branch: refs/heads/ignite-843-rc1 Commit: 85d78e3879b294f4014318168bdafd2943990954 Parents: 4a54451 Author: Andrey Authored: Wed Nov 18 13:35:32 2015 +0700 Committer: Andrey Committed: Wed Nov 18 13:35:32 2015 +0700 ---------------------------------------------------------------------- modules/control-center-web/src/main/js/config.js | 8 ++++---- modules/control-center-web/src/main/js/package.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/85d78e38/modules/control-center-web/src/main/js/config.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js index 95f0947..6ca6005 100644 --- a/modules/control-center-web/src/main/js/config.js +++ b/modules/control-center-web/src/main/js/config.js @@ -25,7 +25,7 @@ System.config({ "angular-nvd3": "github:krispo/angular-nvd3@1.0.3", "angular-sanitize": "github:angular/bower-angular-sanitize@1.4.7", "angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.4", - "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852", + "angular-strap": "github:mgcrea/angular-strap@2.3.6", "angular-tree-control": "github:wix/angular-tree-control@0.2.22", "angular-ui-ace": "github:angular-ui/ui-ace@0.2.3", "babel": "npm:babel-core@5.8.34", @@ -43,9 +43,6 @@ System.config({ "sass": "github:mobilexag/plugin-sass@0.0.10", "scss": "github:theefer/plugin-sass@master", "spinjs": "github:fgnass/spin.js@2.3.2", - "github:akuznetsov-gridgain/angular-strap@fix-1852": { - "angular": "github:angular/bower-angular@1.4.7" - }, "github:angular/bower-angular-animate@1.4.7": { "angular": "github:angular/bower-angular@1.4.7" }, @@ -123,6 +120,9 @@ System.config({ "angular": "github:angular/bower-angular@1.4.7", "css": "github:systemjs/plugin-css@0.1.19" }, + "github:mgcrea/angular-strap@2.3.6": { + "angular": "github:angular/bower-angular@1.4.7" + }, "github:mobilexag/plugin-sass@0.0.10": { "fs": "github:jspm/nodelibs-fs@0.1.2", "querystring": "github:jspm/nodelibs-querystring@0.1.0", http://git-wip-us.apache.org/repos/asf/ignite/blob/85d78e38/modules/control-center-web/src/main/js/package.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json index daae367..3175429 100644 --- a/modules/control-center-web/src/main/js/package.json +++ b/modules/control-center-web/src/main/js/package.json @@ -73,7 +73,7 @@ "angular-nvd3": "github:krispo/angular-nvd3@^1.0.3", "angular-sanitize": "github:angular/bower-angular-sanitize@^1.4.7", "angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4", - "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852", + "angular-strap": "github:mgcrea/angular-strap@2.3.6", "angular-tree-control": "github:wix/angular-tree-control@^0.2.22", "angular-ui-ace": "github:angular-ui/ui-ace@^0.2.3", "css": "github:systemjs/plugin-css@^0.1.19", @@ -132,10 +132,10 @@ "github:components/jquery@2.1.4": { "format": "global" }, - "github:akuznetsov-gridgain/angular-strap@fix-1852": { - "main": "dist/angular-strap.tpl", + "github:mgcrea/angular-strap@2.3.6": { + "main": "angular-strap.tpl", "shim": { - "dist/angular-strap.tpl": { + "angular-strap.tpl": { "deps": [ "./angular-strap" ]