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/06/25 19:59:43 UTC

[airavata-django-portal] 10/10: Merge branch 'mft-download' into develop

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

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 31bb754ea937d76e48794ea28ee0365d23edcbb1
Merge: a0c2421 19e3016
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jun 25 15:57:24 2021 -0400

    Merge branch 'mft-download' into develop

 django_airavata/apps/api/serializers.py            | 11 ++----
 .../django_airavata_api/js/utils/FetchUtils.js     |  3 +-
 django_airavata/apps/api/views.py                  | 45 ++++++----------------
 .../storage/ExperimentStoragePathViewer.vue        | 21 +++++++++-
 .../storage/ExperimentStorageViewContainer.vue     | 16 +++++++-
 .../components/storage/UserStoragePathViewer.vue   | 21 +++++++---
 .../storage-edit/UserStorageDownloadButton.vue     |  2 +-
 .../storage/storage-edit/UserStorageEditViewer.vue |  2 +-
 django_airavata/urls.py                            |  2 +
 docs/dev/custom_output_view_provider.md            |  2 +-
 requirements.txt                                   | 10 +++--
 11 files changed, 80 insertions(+), 55 deletions(-)