You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/03/03 11:33:13 UTC
[10/11] ignite git commit: Merge branch 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13075d90
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13075d90
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13075d90
Branch: refs/heads/ignite-2612
Commit: 13075d901d011a8d598a75817404995e9a09f91e
Parents: 3581dd4 e253f45
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Mar 3 17:15:32 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 3 17:15:32 2016 +0700
----------------------------------------------------------------------
.../form-field-java-class.directive.js | 46 ++++++--
.../form-field-java-class.jade | 38 ++++---
.../src/main/js/app/filters/byName.filter.js | 23 ++++
.../main/js/app/filters/byName/byName.filter.js | 23 ----
.../src/main/js/app/filters/hasPojo.filter.js | 26 +++++
.../js/app/filters/hasPojo/hasPojo.filter.js | 26 -----
.../control-center-web/src/main/js/app/index.js | 19 +++-
.../js/app/modules/branding/Logo.provider.js | 42 -------
.../js/app/modules/branding/Terms.provider.js | 41 -------
.../js/app/modules/branding/branding.module.js | 22 ++--
.../app/modules/branding/branding.provider.js | 111 +++++++++++++++++++
.../app/modules/branding/features.directive.js | 35 ++++++
.../js/app/modules/branding/footer.directive.js | 34 ++++++
.../modules/branding/header-logo.directive.js | 34 ++++++
.../js/app/modules/branding/header-logo.jade | 18 +++
.../modules/branding/header-title.directive.js | 35 ++++++
.../js/app/modules/branding/logo.directive.js | 34 ------
.../src/main/js/app/modules/branding/logo.jade | 18 ---
.../branding/powered-by-apache.directive.js | 4 +-
.../js/app/modules/branding/terms.directive.js | 5 +-
.../js/app/modules/branding/title.directive.js | 35 ------
.../main/js/app/modules/states/admin.state.js | 6 +-
.../app/modules/states/configuration.state.js | 30 ++---
.../clusters/general/discovery/zookeeper.jade | 4 +-
.../main/js/app/modules/states/logout.state.js | 5 +-
.../js/app/modules/states/password.state.js | 10 +-
.../main/js/app/modules/states/profile.state.js | 6 +-
.../main/js/app/modules/states/signin.state.js | 10 +-
.../src/main/js/app/modules/states/sql.state.js | 12 +-
.../control-center-web/src/main/js/config.js | 1 +
.../control-center-web/src/main/js/package.json | 2 +-
.../src/main/js/public/stylesheets/style.scss | 4 +
.../src/main/js/serve/routes/caches.js | 3 +-
.../src/main/js/serve/routes/clusters.js | 3 +-
.../src/main/js/serve/routes/domains.js | 4 +-
.../src/main/js/serve/routes/igfs.js | 3 +-
.../src/main/js/views/includes/footer.jade | 3 +-
.../src/main/js/views/includes/header.jade | 2 +-
.../src/main/js/views/index.jade | 7 +-
.../src/main/js/views/reset.jade | 4 +-
.../src/main/js/views/signin.jade | 12 +-
41 files changed, 468 insertions(+), 332 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13075d90/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13075d90/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13075d90/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
----------------------------------------------------------------------