You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/09/24 20:41:47 UTC
[airavata-django-portal] 02/02: Merge branch
'akbranam-AIRAVATA-2809-GROUP-VIEW' into merge-pr67
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch merge-pr67
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 1dee350f8346e3ca7e607af5a9f9a6689eb350ba
Merge: e37a60c 257a1b0
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Sep 24 16:41:07 2021 -0400
Merge branch 'akbranam-AIRAVATA-2809-GROUP-VIEW' into merge-pr67
django_airavata/apps/admin/package.json | 2 +-
.../ComputeResourceReservationList.vue | 6 +-
.../GroupComputeResourcePreference.vue | 6 +-
.../applications/ApplicationDeploymentsList.vue | 2 +-
.../ComputeResourcePreferenceDashboard.vue | 4 +-
.../dashboards/CredentialStoreDashboard.vue | 10 +-
.../gatewayprofile/StoragePreferenceList.vue | 6 +-
.../notices/NoticesManagementContainer.vue | 6 +-
.../statistics/ExperimentStatisticsContainer.vue | 10 +-
.../IdentityServiceUserManagementContainer.vue | 6 +-
.../UnverifiedEmailUserManagementContainer.vue | 2 +-
django_airavata/apps/admin/yarn.lock | 74 +-
django_airavata/apps/groups/package.json | 4 +-
.../js/group_components/GroupEditor.vue | 9 +-
.../GroupMembersDetailsContainer.vue | 72 +
.../js/group_components/GroupMembersEditor.vue | 471 ++-
django_airavata/apps/groups/yarn.lock | 4389 ++++++++++----------
django_airavata/apps/workspace/package.json | 2 +-
.../components/storage/UserStoragePathViewer.vue | 6 +-
django_airavata/apps/workspace/yarn.lock | 74 +-
django_airavata/static/common/package.json | 2 +-
django_airavata/static/common/yarn.lock | 74 +-
22 files changed, 2839 insertions(+), 2398 deletions(-)