You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/03/26 13:51:34 UTC
[incubator-dlab] 03/05: Merge branch 'develop' of
https://github.com/apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5d110f8a659b59601aa17cd29771d33c41fc98fa
Merge: fdc5776 dab906f
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Mar 26 15:42:19 2020 +0200
Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
.../scripts/gcp/common_terminate_notebook.py | 2 +-
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 2 +
.../dlab/backendapi/resources/dto/UserRoleDto.java | 2 +
.../src/main/resources/mongo/aws/mongo_roles.json | 28 +++++++++
.../main/resources/mongo/azure/mongo_roles.json | 23 +++++++
.../src/main/resources/mongo/gcp/mongo_roles.json | 26 ++++++++
.../management/management.component.ts | 70 +++++++++++-----------
.../app/administration/roles/roles.component.ts | 9 +--
.../services/applicationServiceFacade.service.ts | 6 --
.../src/app/core/services/project.service.ts | 9 ---
.../multi-level-select-dropdown.component.html | 26 +++++++-
.../multi-level-select-dropdown.component.scss | 4 +-
.../multi-level-select-dropdown.component.ts | 39 +++++++++++-
.../webapp/src/assets/styles/_dialogs.scss | 1 +
14 files changed, 189 insertions(+), 58 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org