You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by ad...@apache.org on 2019/09/12 13:05:25 UTC
[incubator-dlab] 01/03: Merge remote-tracking branch
'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1037
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6f4462a2852a060621778edb786a00d542a2eea7
Merge: e3f7dd7 7e07166
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Tue Sep 10 16:42:38 2019 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../src/general/lib/os/debian/common_lib.py | 54 +++++++++++-----------
.../scripts/aws/tensor-rstudio_configure.py | 2 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +-
.../management/endpoints/endpoints.component.scss | 17 +++++++
.../manage-environment-dilog.component.html | 4 +-
.../administration/project/project.component.ts | 3 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 2 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +++
.../create-environment.component.ts | 2 +-
.../resources-grid/resources-grid.component.scss | 13 ++----
.../resources-grid/resources-grid.component.ts | 4 +-
.../confirmation-dialog.component.ts | 13 +++---
.../resources/webapp/src/assets/styles/_theme.scss | 17 ++-----
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 4 +-
18 files changed, 86 insertions(+), 71 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org