You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/07/13 14:26:36 UTC

[incubator-dlab] 01/01: Merge branch 'develop' into DLAB-1749

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

ofuks pushed a commit to branch DLAB-1749
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 507cb3da25cb226ffc087d4be6d4cfe2fd513a81
Merge: 6737547 ca3f908
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Mon Jul 13 17:25:39 2020 +0300

    Merge branch 'develop' into DLAB-1749

 .../com/epam/dlab/backendapi/dao/AuditDAOImpl.java |  7 ++
 .../dlab/backendapi/domain/AuditActionEnum.java    |  2 +-
 .../dlab/backendapi/domain/AuditCreateDTO.java     |  2 +
 .../backendapi/domain/AuditResourceTypeEnum.java   |  3 +-
 .../backendapi/resources/UserGroupResource.java    |  2 +-
 .../dlab/backendapi/resources/dto/GroupDTO.java    |  3 +-
 .../backendapi/service/ExploratoryService.java     |  2 +
 .../backendapi/service/impl/AuditServiceImpl.java  |  3 +-
 .../service/impl/ComputationalServiceImpl.java     | 41 ++++++-----
 .../service/impl/EndpointServiceImpl.java          |  8 +--
 .../service/impl/ExploratoryServiceImpl.java       | 58 +++++++++++-----
 .../service/impl/ProjectServiceImpl.java           | 53 +++++++-------
 .../service/impl/SchedulerJobServiceImpl.java      | 40 +++++------
 .../administration/project/project-data.service.ts | 13 ++--
 .../project-list/project-list.component.html       |  4 +-
 .../cluster-details/cluster-details.component.html |  5 +-
 ...utational-resource-create-dialog.component.html |  2 +-
 ...mputational-resource-create-dialog.component.ts |  7 +-
 .../resources-grid/resources-grid.component.html   |  4 +-
 .../resources-grid/resources-grid.component.ts     |  6 ++
 .../resources/scheduler/scheduler.component.html   | 13 ++--
 .../app/resources/scheduler/scheduler.component.ts |  9 +--
 .../notification-dialog.component.ts               | 17 ++---
 .../src/app/shared/navbar/navbar.component.scss    |  4 ++
 .../resources/ImageExploratoryResourceTest.java    |  2 +-
 .../resources/UserGroupResourceTest.java           |  8 +--
 .../service/impl/ExploratoryServiceImplTest.java   | 32 ++++-----
 .../service/impl/SchedulerJobServiceImplTest.java  | 80 +++++++++++-----------
 28 files changed, 243 insertions(+), 187 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org