You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/03/06 10:04:45 UTC
[incubator-dlab] 01/01: Merge pull request #21 from apache/DLAB-375
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2b08c03424eae1585fb9aa0a361c6b54d2704765
Merge: ee68d4e f762434
Author: bhliva <bo...@ukr.net>
AuthorDate: Wed Mar 6 12:04:40 2019 +0200
Merge pull request #21 from apache/DLAB-375
[DLAB-375][Admin page]: Merge Health status and Environment Management pages
.../main/resources/webapp/src/app/app.module.ts | 2 -
.../resources/webapp/src/app/app.routing.module.ts | 5 -
.../app/core/models/resourceShapeTypes.model.ts | 2 +-
.../src/app/core/services/appRouting.service.ts | 2 +-
.../src/app/core/services/cloudProvider.guard.ts | 2 -
.../src/app/core/services/healthStatus.service.ts | 4 +-
.../app/health-status/environment-status.model.ts | 54 -----
.../health-status-grid.component.html | 69 ------
.../health-status-grid.component.scss | 24 ---
.../health-status-grid.component.ts | 87 --------
.../app/health-status/health-status.component.html | 50 -----
.../app/health-status/health-status.component.scss | 37 ----
.../app/health-status/health-status.component.ts | 231 ---------------------
.../src/app/health-status/health-status.module.ts | 71 -------
.../backup-dilog/backup-dilog.component.html | 0
.../backup-dilog/backup-dilog.component.scss | 0
.../backup-dilog/backup-dilog.component.ts | 2 +-
.../resources/webapp/src/app/management/index.ts | 61 +++++-
.../manage-environment-dilog.component.html | 0
.../manage-environment-dilog.component.scss | 0
.../manage-environment-dilog.component.ts | 0
.../group-name-validarion.directive.ts | 0
.../manage-roles-groups.component.html | 0
.../manage-roles-groups.component.scss | 0
.../manage-roles-groups.component.ts | 0
.../management-grid/management-grid.component.html | 69 +++++-
.../management-grid/management-grid.component.ts | 54 ++++-
.../src/app/management/management.component.html | 46 +++-
.../src/app/management/management.component.scss | 8 +-
.../src/app/management/management.component.ts | 229 +++++++++++++++++---
.../webapp/src/app/management/management.model.ts | 28 +++
.../ssn-monitor/ssn-monitor.component.html | 0
.../ssn-monitor/ssn-monitor.component.scss | 0
.../ssn-monitor/ssn-monitor.component.ts | 0
.../resources-grid/resources-grid.component.ts | 2 +-
.../src/app/shared/navbar/navbar.component.html | 5 +-
.../src/app/shared/navbar/navbar.component.ts | 2 +-
37 files changed, 452 insertions(+), 694 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org