This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 8f26b55813bf2e58da4763efd4c20eab75c5dbe4
Merge: 0c389f1 3ce0fb8
Author: Andriana Kovalyshyn <[email protected]>
AuthorDate: Mon May 27 11:47:13 2019 +0300

    Merge branch 'project_grid' of github.com:apache/incubator-dlab into 
feature/projects

 .../src/main/resources/webapp/angular.json         |   16 +-
 .../src/main/resources/webapp/package-lock.json    | 3202 +++++---------------
 .../src/main/resources/webapp/package.json         |   28 +-
 .../administration.module.ts}                      |   32 +-
 .../backup-dilog/backup-dilog.component.html       |   14 +-
 .../backup-dilog/backup-dilog.component.scss       |    0
 .../backup-dilog/backup-dilog.component.ts         |   20 +-
 .../app/{ => administration}/management/index.ts   |   33 +-
 .../manage-environment-dilog.component.html        |    0
 .../manage-environment-dilog.component.scss        |    0
 .../manage-environment-dilog.component.ts          |    2 +-
 .../group-name-validarion.directive.ts             |    0
 .../manage-roles-groups.component.html             |    2 +-
 .../manage-roles-groups.component.scss             |    0
 .../manage-roles-groups.component.ts               |    4 +-
 .../management-grid/management-grid.component.html |    0
 .../management-grid/management-grid.component.scss |    0
 .../management-grid/management-grid.component.ts   |   10 +-
 .../management/management.component.html           |    4 +-
 .../management/management.component.scss           |    0
 .../management/management.component.ts             |   15 +-
 .../management/management.model.ts                 |    0
 .../ssn-monitor/ssn-monitor.component.html         |    0
 .../ssn-monitor/ssn-monitor.component.scss         |    0
 .../ssn-monitor/ssn-monitor.component.ts           |    2 +-
 .../scheduler => administration/project}/index.ts  |   23 +-
 .../project/project-data.service.ts}               |   48 +-
 .../project-form/project-form.component.html       |  113 +
 .../project-form/project-form.component.scss}      |   33 +-
 .../project/project-form/project-form.component.ts |  112 +
 .../administration/project/project-list/data.ts    |   16 +
 .../project-list/project-list.component.html       |   54 +
 .../project-list/project-list.component.scss}      |   33 +-
 .../project/project-list/project-list.component.ts |   65 +
 .../project/project.component.html}                |   19 +-
 .../project/project.component.scss}                |   12 +-
 .../administration/project/project.component.ts    |  109 +
 .../resources/webapp/src/app/app.component.html    |    1 -
 .../main/resources/webapp/src/app/app.module.ts    |   25 +-
 .../resources/webapp/src/app/app.routing.module.ts |   68 +-
 .../resources/webapp/src/app/core/core.module.ts   |   11 +-
 .../services/applicationServiceFacade.service.ts   |   22 +
 .../services/endpoint.service.ts}                  |   33 +-
 .../src/app/core/services/healthStatus.service.ts  |    2 +-
 .../webapp/src/app/core/services/index.ts          |    2 +
 .../services/project.service.ts}                   |   41 +-
 .../layout.component.html}                         |    1 -
 .../layout.component.ts}                           |   17 +-
 .../index.ts => layout/layout.module.ts}           |   16 +-
 .../webapp/src/app/reporting/reporting.module.ts   |    2 -
 .../cost-details-dialog.component.html             |   10 +-
 .../cost-details-dialog.component.ts               |   26 +-
 .../resources/billing/cost-details-dialog/index.ts |    1 +
 .../cluster-details/cluster-details.component.html |   14 +-
 .../cluster-details/cluster-details.component.ts   |   24 +-
 .../computational/cluster-details/index.ts         |    1 +
 ...utational-resource-create-dialog.component.html |   18 +-
 ...mputational-resource-create-dialog.component.ts |   63 +-
 .../computational-resource-create-dialog/index.ts  |    1 +
 .../computational-resources-list.component.html    |    4 +-
 .../computational-resources-list.component.ts      |   16 +-
 .../ami-create-dialog.component.html               |   17 +-
 .../ami-create-dialog.component.ts                 |   28 +-
 .../exploratory/ami-create-dialog/index.ts         |    1 +
 .../detail-dialog/detail-dialog.component.html     |   14 +-
 .../detail-dialog/detail-dialog.component.ts       |   40 +-
 .../resources/exploratory/detail-dialog/index.ts   |    3 +-
 ...ratory-environment-create-dialog.component.html |   17 +-
 ...loratory-environment-create-dialog.component.ts |   51 +-
 .../exploratory-environment-create-dialog/index.ts |   11 +-
 .../exploratory/install-libraries/index.ts         |    3 +-
 .../install-libraries.component.html               |   18 +-
 .../install-libraries.component.ts                 |   59 +-
 .../manage-ungit/manage-ungit.component.html       |   15 +-
 .../manage-ungit/manage-ungit.component.ts         |   33 +-
 .../resources-grid/resources-grid.component.html   |   13 +-
 .../resources-grid/resources-grid.component.ts     |   42 +-
 .../src/app/resources/resources.component.html     |    4 +-
 .../src/app/resources/resources.component.ts       |   23 +-
 .../webapp/src/app/resources/resources.module.ts   |    6 +-
 .../webapp/src/app/resources/scheduler/index.ts    |    1 +
 .../resources/scheduler/scheduler.component.html   |   15 +-
 .../app/resources/scheduler/scheduler.component.ts |   45 +-
 .../app/shared/modal-dialog/modal.component.scss   |  183 +-
 .../notification-dialog.component.ts               |   58 +-
 .../src/app/shared/navbar/navbar.component.html    |   88 +-
 .../src/app/shared/navbar/navbar.component.scss    |   16 +-
 .../src/app/shared/navbar/navbar.component.ts      |   14 +-
 .../webapp/src/assets/styles/_dialogs.scss         |  180 ++
 .../webapp/src/assets/styles/_general.scss         |    4 +-
 .../resources/webapp/src/assets/styles/_theme.scss |  146 +-
 .../styles/_variables.scss}                        |   11 +-
 .../src/main/resources/webapp/src/styles.scss      |   14 +-
 93 files changed, 2403 insertions(+), 3210 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to