ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [01/41] incubator-ignite git commit: # ignite-1121 merge with ignite-843
Date Fri, 31 Jul 2015 02:28:14 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1121 1ff248cfd -> e24f3b74b


# ignite-1121 merge with 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/9f901032
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f901032
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f901032

Branch: refs/heads/ignite-1121
Commit: 9f901032577e2b4ba50f55454ad10b11750c9538
Parents: ea15083 95f54db
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Jul 24 10:04:56 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Jul 24 10:04:56 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/metadata-controller.js  | 67 +++++++++----
 .../src/main/js/controllers/models/caches.json  |  8 +-
 .../main/js/controllers/models/clusters.json    |  8 +-
 .../main/js/controllers/models/metadata.json    | 36 ++++---
 .../src/main/js/controllers/models/summary.json |  2 +-
 .../web-control-center/src/main/js/package.json |  2 -
 .../src/main/js/public/stylesheets/style.less   |  2 +-
 .../main/js/views/configuration/metadata.jade   |  2 +-
 .../src/main/js/views/includes/controls.jade    | 98 ++++++++++----------
 .../src/main/js/views/sql/sql.jade              |  6 +-
 10 files changed, 138 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f901032/modules/web-control-center/src/main/js/package.json
----------------------------------------------------------------------
diff --cc modules/web-control-center/src/main/js/package.json
index 477266a,7295755..bfbf034
--- a/modules/web-control-center/src/main/js/package.json
+++ b/modules/web-control-center/src/main/js/package.json
@@@ -37,10 -37,7 +37,8 @@@
      "passport": "^0.2.1",
      "passport-local": "^1.0.0",
      "passport-local-mongoose": "^1.0.0",
-     "pg": "^4.4.0",
 -    "serve-favicon": "~2.2.0"
 +    "serve-favicon": "~2.2.0",
-     "util": "^0.10.3",
 +    "ws": "~0.7.2"
    },
    "devDependencies": {
      "morgan": "~1.5.1",


Mime
View raw message