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 2022/07/05 19:03:33 UTC

[airavata-django-portal] 01/01: Merge branch 'master' into delta-topology-workshop

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

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

commit 49695af04798d1de6f5be3f2a162a5542744740a
Merge: 6d85634f 5fac9dfb
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jul 5 15:03:24 2022 -0400

    Merge branch 'master' into delta-topology-workshop

 .../js/models/ApplicationInterfaceDefinition.js    |  6 +++-
 .../js/store/modules/view-experiment.js            | 19 ++++++++----
 .../js/web-components/ComputeResourceSelector.vue  |  3 +-
 .../ExperimentComputeResourceSelector.vue          | 30 +++++++++++++------
 .../js/web-components/ExperimentEditor.vue         |  7 +++--
 docs/dev/new_django_app.md                         | 35 ++++++++++++----------
 requirements-dev.txt                               | 14 +++++----
 7 files changed, 73 insertions(+), 41 deletions(-)