You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/07/03 14:57:07 UTC
[incubator-dlab] 01/02: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1902
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1902
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6bb8f3691081ed9a99c4119d3b61e09bfeccbc8a
Merge: 1926a5a dffcbb0
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Jul 3 17:13:53 2020 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1902
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 28 ++++-
.../com/epam/dlab/backendapi/dao/BillingDAO.java | 3 +
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 15 ++-
.../com/epam/dlab/backendapi/domain/BudgetDTO.java | 34 ++++++
.../epam/dlab/backendapi/domain/ProjectDTO.java | 2 +-
.../backendapi/domain/UpdateProjectBudgetDTO.java | 3 +
.../resources/ImageExploratoryResource.java | 2 +-
.../resources/LibExploratoryResource.java | 2 +-
.../dlab/backendapi/resources/ProjectResource.java | 13 +-
.../service/impl/ProjectServiceImpl.java | 38 ++++--
.../audit/audit-grid/audit-grid.component.ts | 136 ++++++++++++++-------
.../cluster-details/cluster-details.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.ts | 2 +-
.../resources/LibExploratoryResourceTest.java | 2 +-
15 files changed, 212 insertions(+), 72 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org