This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch simple-kilt
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 081d5a7ff7f4a881828969dec6717f308ddb4f55
Merge: c578e1b3 2429a734
Author: Alex Heneveld <g...@alex.heneveld.org>
AuthorDate: Fri Jun 28 08:58:53 2024 +0100
Merge branch 'master' into simple-kilt
.../catalog/app/views/catalog/catalog.state.js | 14 +++-
ui-modules/login/app/views/main/main.controller.js | 32 ++++++--
ui-modules/login/package.json | 2 +-
.../utils/catalog-uploader/catalog-uploader.html | 88 +++++++++++++-------
.../utils/catalog-uploader/catalog-uploader.js | 27 ++++--
.../utils/catalog-uploader/catalog-uploader.less | 95 +++++++++++++++-------
6 files changed, 180 insertions(+), 78 deletions(-)
