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/04/27 20:32:37 UTC
[airavata-django-portal] 01/01: Merge branch 'develop' into staging
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 1d0a8573b8ed2735f83e21d9966483e8b47a7124
Merge: 0870a6b 0ae3cff
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Apr 27 16:31:19 2021 -0400
Merge branch 'develop' into staging
Dockerfile | 1 -
README.md | 8 --
.../dashboards/CredentialStoreDashboard.vue | 53 ++++++++-
.../statistics/ExperimentDetailsView.vue | 19 ----
django_airavata/apps/api/serializers.py | 61 +++++-----
.../api/static/django_airavata_api/js/index.js | 1 +
.../django_airavata_api/js/models/Experiment.js | 1 -
.../js/models/ExperimentStoragePath.js | 4 +
.../django_airavata_api/js/service_config.js | 12 ++
.../django_airavata_api/js/utils/FetchUtils.js | 4 +
django_airavata/apps/api/tus.py | 12 +-
django_airavata/apps/api/urls.py | 4 +
django_airavata/apps/api/views.py | 68 +++++++++--
django_airavata/apps/auth/backends.py | 7 ++
.../js/containers/GroupCreateContainer.vue | 8 +-
.../js/containers/GroupEditContainer.vue | 6 +-
.../js/group-create-entry-point.js | 20 +++-
.../js/group-edit-entry-point.js | 5 +
.../templates/django_airavata_groups/base.html | 2 +-
.../django_airavata_groups/group_edit.html | 2 +-
django_airavata/apps/groups/views.py | 2 +
.../js/components/experiment/ExperimentEditor.vue | 13 +++
.../js/components/experiment/ExperimentSummary.vue | 28 ++---
.../output-displays/DefaultOutputDisplay.vue | 10 +-
.../storage/ExperimentStoragePathViewer.vue | 125 +++++++++++++++++++++
.../storage/ExperimentStorageViewContainer.vue | 48 ++++++++
...athBreadcrumb.vue => StoragePathBreadcrumb.vue} | 8 +-
.../storage/UserStorageFileSelectionContainer.vue | 1 -
.../components/storage/UserStoragePathViewer.vue | 24 ++--
.../storage/storage-edit/UserStorageLink.vue | 2 +-
.../js/containers/ExperimentListContainer.vue | 5 +-
.../django_airavata_workspace/js/utils/urls.js | 6 -
django_airavata/static/common/js/components.js | 3 +
.../static/common/js/components/ShareButton.vue | 10 +-
django_airavata/static/common/package.json | 6 +-
django_airavata/static/common/vue.config.js | 25 +++--
docs/dev/new_django_app.md | 4 +-
vetur.config.js | 11 ++
38 files changed, 486 insertions(+), 143 deletions(-)