You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/02/15 11:56:23 UTC

[incubator-datalab] 02/04: Merge branch 'develop' of https://github.com/apache/incubator-datalab into develop

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

ykinash pushed a commit to branch DATALAB-2228
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 749bc98b22bc567cf6f2766a7691752f96fa31e8
Merge: b1dbf99 cb0bb49
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Thu Feb 11 16:19:18 2021 +0200

    Merge branch 'develop' of https://github.com/apache/incubator-datalab into develop

 .../src/dataengine/scripts/configure_dataengine.py |  2 +-
 .../src/general/conf/datalab.ini                   |  2 ++
 .../src/jupyter/scripts/configure_jupyter_node.py  |  2 +-
 .../scripts/configure_jupyterlab_node.py           |  2 +-
 .../src/rstudio/scripts/configure_rstudio_node.py  |  2 +-
 .../scripts/configure_tensor-rstudio_node.py       |  2 +-
 .../zeppelin/scripts/configure_zeppelin_node.py    |  2 +-
 .../configuration/configuration.component.html     | 39 ++++++++++++----------
 .../configuration/configuration.component.ts       | 27 +++++++--------
 .../app/core/services/configutration.service.ts    | 13 ++++++--
 .../reporting-grid/reporting-grid.component.html   | 11 +++++-
 .../reporting-grid/reporting-grid.component.scss   | 13 ++++----
 .../bucket-browser/bucket-browser.component.ts     |  1 +
 .../bucket-confirmation-dialog.component.scss      |  4 +--
 .../resources-grid/resources-grid.component.scss   |  1 +
 .../multi-select-dropdown.component.html           |  2 +-
 .../src/main/resources/webapp/src/styles.scss      |  4 +++
 17 files changed, 80 insertions(+), 49 deletions(-)


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