Merge remote-tracking branch 'origin/web-console-staging' into ignite-3262
Conflicts:
modules/web-console/src/main/js/package.json
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e6a518c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e6a518c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e6a518c
Branch: refs/heads/ignite-3262
Commit: 2e6a518c0ac163e28be7479f74d1a20b8036b086
Parents: 701417a 00d8c0a
Author: Maxim Afanasiev <[email protected]>
Authored: Thu Jun 30 13:00:00 2016 +0700
Committer: Maxim Afanasiev <[email protected]>
Committed: Thu Jun 30 13:00:00 2016 +0700
----------------------------------------------------------------------
.../web-console/src/main/js/app/app.config.js | 86 +
modules/web-console/src/main/js/app/app.js | 167 +-
.../main/js/app/controllers/auth.controller.js | 30 +
.../js/app/controllers/notebooks.controller.js | 69 +
.../controllers/reset-password.controller.js | 51 +
.../js/app/directives/auto-focus.directive.js | 26 +
.../directives/copy-to-clipboard.directive.js | 29 +
.../main/js/app/directives/match.directive.js | 27 +
.../app/directives/on-click-focus.directive.js | 26 +
.../directives/on-enter-focus-move.directive.js | 29 +
.../js/app/directives/on-enter.directive.js | 32 +
.../js/app/directives/on-escape.directive.js | 32 +
.../directives/retain-selection.directive.js | 66 +
.../js/app/filters/domainsValidation.filter.js | 33 +
.../src/main/js/app/helpers/jade/mixins.jade | 26 +-
.../src/main/js/app/modules/Demo/Demo.module.js | 13 +-
.../main/js/app/modules/agent/agent.module.js | 10 +-
.../modules/form/field/dropdown.directive.js | 5 +-
.../js/app/modules/form/field/dropdown.jade | 4 +-
.../form/field/input/checkbox.directive.js | 5 +-
.../form/field/input/datalist.directive.js | 5 +-
.../app/modules/form/field/input/datalist.jade | 2 +-
.../form/field/input/number.directive.js | 5 +-
.../modules/form/field/input/text.directive.js | 5 +-
.../app/modules/form/panel/revert.directive.js | 4 +-
.../states/configuration/caches/store.jade | 4 +-
.../states/configuration/domains/query.jade | 14 +-
.../states/configuration/domains/store.jade | 8 +-
.../modules/states/configuration/igfs/misc.jade | 4 +-
.../configuration/summary/summary.controller.js | 13 +-
.../main/js/app/modules/user/Auth.service.js | 10 +-
.../src/main/js/app/services/Clone.service.js | 64 +
.../js/app/services/ConfirmBatch.service.js | 85 +
.../js/app/services/CopyToClipboard.service.js | 50 +
.../src/main/js/app/services/Focus.service.js | 33 +
.../main/js/app/services/LegacyTable.service.js | 205 +++
.../main/js/app/services/LegacyUtils.service.js | 941 ++++++++++
.../main/js/app/services/Messages.service.js | 51 +
.../app/services/UnsavedChangesGuard.service.js | 38 +
.../src/main/js/app/services/confirm.service.js | 2 +-
.../src/main/js/controllers/admin-controller.js | 33 +-
.../main/js/controllers/caches-controller.js | 84 +-
.../main/js/controllers/clusters-controller.js | 132 +-
.../src/main/js/controllers/common-module.js | 1741 ------------------
.../main/js/controllers/domains-controller.js | 267 ++-
.../src/main/js/controllers/igfs-controller.js | 116 +-
.../main/js/controllers/profile-controller.js | 24 +-
.../src/main/js/controllers/sql-controller.js | 65 +-
.../src/main/js/gulpfile.babel.js/paths.js | 2 +-
.../main/js/gulpfile.babel.js/webpack/common.js | 4 +-
.../webpack/environments/development.js | 2 +-
modules/web-console/src/main/js/package.json | 4 +-
.../src/main/js/public/stylesheets/style.scss | 1 +
modules/web-console/src/main/js/serve/agent.js | 89 +-
.../src/main/js/serve/routes/agent.js | 30 +-
.../js/views/configuration/domains-import.jade | 2 +-
.../web-console/src/main/js/views/reset.jade | 4 +-
.../src/main/js/views/settings/profile.jade | 16 +-
.../web-console/src/main/js/views/signin.jade | 28 +-
.../src/main/js/views/sql/notebook-new.jade | 2 +-
.../src/main/js/views/sql/paragraph-rate.jade | 2 +-
.../web-console/src/main/js/views/sql/sql.jade | 6 +-
.../main/js/views/templates/agent-download.jade | 2 +-
.../src/main/js/views/templates/clone.jade | 2 +-
64 files changed, 2619 insertions(+), 2348 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e6a518c/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --cc modules/web-console/src/main/js/package.json
index 9d5b621,ed7e480..25d9d15
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@@ -6,9 -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"
++ "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/"
},
"author": "",
"contributors": [
