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/08/29 18:51:23 UTC

[airavata-django-portal] 11/11: Merge branch 'AIRAVATA-3649' 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 373c21f99c66f79853f189df267e775df77ec833
Merge: ba4cb026 15c7da95
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Aug 29 14:50:48 2022 -0400

    Merge branch 'AIRAVATA-3649' into develop

 .../applications/ApplicationInterfaceEditor.vue    |  51 ++++++++--
 ...icationsettings_queue_settings_calculator_id.py |  18 ++++
 django_airavata/apps/api/models.py                 |   1 +
 django_airavata/apps/api/serializers.py            |  42 ++++++---
 .../api/static/django_airavata_api/js/index.js     |   3 +
 .../js/models/ApplicationInterfaceDefinition.js    |   5 +
 .../js/models/QueueSettingsCalculator.js           |   9 ++
 .../django_airavata_api/js/service_config.js       |  15 +++
 django_airavata/apps/api/urls.py                   |   2 +
 django_airavata/apps/api/views.py                  |  31 +++++-
 .../js/components/experiment/ExperimentEditor.vue  |  58 +++++++++---
 .../components/experiment/QueueSettingsEditor.vue  |  72 +++++++++++---
 docs/dev/queue_settings_calculator.md              | 104 +++++++++++++++++++++
 mkdocs.yml                                         |   1 +
 requirements.txt                                   |   2 +-
 15 files changed, 370 insertions(+), 44 deletions(-)