Merge remote-tracking branch 'origin/web-console-staging' into ignite-3262
Conflicts:
modules/web-console/src/main/js/package.json
modules/web-console/src/main/js/serve/middlewares/api.js
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/122f1ca6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/122f1ca6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/122f1ca6
Branch: refs/heads/ignite-3262
Commit: 122f1ca62c620ce54218e7d33032d783e9ca1219
Parents: cac7d96 a2b9999
Author: Maxim Afanasiev <[email protected]>
Authored: Thu Jun 30 17:52:33 2016 +0700
Committer: Maxim Afanasiev <[email protected]>
Committed: Thu Jun 30 17:52:33 2016 +0700
----------------------------------------------------------------------
modules/web-console/DEVNOTES.txt | 4 +-
modules/web-console/src/main/js/app/app.js | 6 +-
.../js/app/modules/loading/loading.directive.js | 4 +-
.../js/app/modules/loading/loading.service.js | 2 +-
.../configuration/summary/summary.controller.js | 8 +--
.../src/main/js/app/services/Confirm.service.js | 70 ++++++++++++++++++++
.../js/app/services/ModelNormalizer.service.js | 59 +++++++++++++++++
.../src/main/js/app/services/cleanup.service.js | 46 -------------
.../src/main/js/app/services/confirm.service.js | 70 --------------------
.../main/js/controllers/caches-controller.js | 14 ++--
.../main/js/controllers/clusters-controller.js | 14 ++--
.../main/js/controllers/domains-controller.js | 30 ++++-----
.../src/main/js/controllers/igfs-controller.js | 14 ++--
.../src/main/js/controllers/sql-controller.js | 14 ++--
.../src/main/js/gulpfile.babel.js/paths.js | 29 +-------
modules/web-console/src/main/js/package.json | 2 +-
16 files changed, 188 insertions(+), 198 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/122f1ca6/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --cc modules/web-console/src/main/js/package.json
index 25d9d15,b2c648d..aee2179
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@@ -6,10 -6,7 +6,10 @@@
"scripts": {
"dev": "cross-env NODE_ENV=development gulp watch",
"build": "cross-env NODE_ENV=production gulp build",
+ "test": "karma start karma.conf.js",
+ "ci-test-backend": "cross-env NODE_ENV=test
CONFIG_PATH='./test/backend/config/settings.json' mocha -u tdd --require
babel-core/register --reporter mocha-teamcity-reporter --recursive
./test/backend/unit",
+ "test-backend": "cross-env NODE_ENV=test
CONFIG_PATH='./test/backend/config/settings.json' mocha -u tdd --require
babel-core/register --recursive ./test/backend/unit",
- "eslint": "eslint --env node --format
node_modules/eslint-friendly-formatter gulpfile.babel.js/ serve/"
+ "eslint": "eslint --env node --format
node_modules/eslint-friendly-formatter gulpfile.babel.js/ serve/ app/
controllers/ generator/ ignite_modules/ ignite_modules_temp/"
},
"author": "",
"contributors": [
