[airavata-django-portal] branch master updated (cf3c5867 -> 5fac9dfb)

[ma...@apache.org]

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

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


    from cf3c5867 Dropping Jinja2 to 3.0 for Py3.6 compat
     add 065a95f7 AIRAVATA-3627 If not found error when application interface deleted
     add 2d317274 AIRAVATA-3628 Fix updating resourceHostId in store
     add 4047f631 AIRAVATA-3630 Default showQueueSettings to true
     new 5fac9dfb Merge branch 'staging'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../js/models/ApplicationInterfaceDefinition.js    |  6 ++++-
 .../js/store/modules/view-experiment.js            | 19 +++++++++-----
 .../js/web-components/ComputeResourceSelector.vue  |  3 ++-
 .../ExperimentComputeResourceSelector.vue          | 30 +++++++++++++++-------
 4 files changed, 41 insertions(+), 17 deletions(-)

[airavata-django-portal] 01/01: Merge branch 'staging'

[ma...@apache.org]

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

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

commit 5fac9dfbd07556965253e4947bfc00e40c37ac37
Merge: cf3c5867 4047f631
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jul 5 14:36:40 2022 -0400

    Merge branch 'staging'

 .../js/models/ApplicationInterfaceDefinition.js    |  6 ++++-
 .../js/store/modules/view-experiment.js            | 19 +++++++++-----
 .../js/web-components/ComputeResourceSelector.vue  |  3 ++-
 .../ExperimentComputeResourceSelector.vue          | 30 +++++++++++++++-------
 4 files changed, 41 insertions(+), 17 deletions(-)