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/08/23 20:33:16 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 9f993b3b4c3f14da135dcc05161b842a39b71870
Merge: 885578c fb1c4ee
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Aug 23 16:30:14 2021 -0400

    Merge branch 'develop' into staging

 README.md                                          |   16 +
 build_js.bat                                       |   36 +
 django_airavata/apps/admin/package.json            |    3 +-
 .../applications/ApplicationDeploymentEditor.vue   |   18 +-
 .../statistics/ExperimentStatisticsContainer.vue   |   41 +-
 .../IdentityServiceUserManagementContainer.vue     |    2 +-
 .../UnverifiedEmailUserManagementContainer.vue     |    2 +-
 django_airavata/apps/admin/yarn.lock               |   39 +-
 django_airavata/apps/api/exceptions.py             |    2 +-
 django_airavata/apps/api/package.json              |    7 +-
 django_airavata/apps/api/serializers.py            |    2 +-
 .../api/static/django_airavata_api/js/index.js     |    2 +
 .../js/models/ApplicationInterfaceDefinition.js    |   11 +
 .../django_airavata_api/js/service_config.js       |    3 +
 .../js/utils/ExperimentUtils.js                    |  177 +++
 .../js/utils/PaginationIterator.js                 |   11 +-
 .../tests/utils/ExperimentUtils.test.js            |  589 ++++++++++
 django_airavata/apps/api/views.py                  |   66 +-
 django_airavata/apps/api/yarn.lock                 |   39 +-
 django_airavata/apps/auth/backends.py              |    6 +-
 django_airavata/apps/auth/package.json             |    3 +-
 .../settings_local.py.template                     |    7 -
 django_airavata/apps/auth/views.py                 |    3 +-
 django_airavata/apps/auth/yarn.lock                |   39 +-
 django_airavata/apps/dataparsers/package.json      |    3 +-
 django_airavata/apps/dataparsers/yarn.lock         |   39 +-
 django_airavata/apps/groups/package.json           |    3 +-
 django_airavata/apps/groups/yarn.lock              |   39 +-
 .../package.json                                   |    7 +-
 .../django-airavata-workspace-plugin-api/yarn.lock |   39 +-
 django_airavata/apps/workspace/package.json        |    3 +-
 .../output-displays/ImageOutputDisplay.vue         |    4 +-
 .../storage/ExperimentStoragePathViewer.vue        |    8 +
 .../components/storage/UserStorageCreateView.vue   |    6 +-
 .../components/storage/UserStoragePathViewer.vue   |   10 +-
 .../js/containers/UserStorageContainer.vue         |   59 +-
 .../js/web-components/ExperimentEditor.vue         |  187 +++-
 .../js/web-components/QueueSettingsEditor.vue      |    2 +-
 .../js/web-components/ResourceSelectionEditor.vue  |   19 +-
 .../js/web-components/store.js                     |    6 +
 django_airavata/apps/workspace/yarn.lock           |   39 +-
 django_airavata/middleware.py                      |   17 -
 django_airavata/settings.py                        |  201 +++-
 django_airavata/settings_local.py.ide              |   18 +-
 django_airavata/settings_local.py.sample           |   28 +-
 django_airavata/static/common/babel.config.js      |    2 +-
 .../common/js/components/ApplicationName.vue       |   22 +-
 .../static/common/js/components/Pager.vue          |    9 +-
 django_airavata/static/common/package.json         |   11 +-
 django_airavata/static/common/yarn.lock            |  426 ++++---
 django_airavata/static/css/draft-colors.css        |    3 -
 django_airavata/templates/base.html                |    1 +
 .../templates/blocks/bootstrap/buttonmore.html     |    7 +
 .../includes/favicon.html                          |    9 +
 django_airavata/templates/includes/head.html       |    3 +-
 django_airavata/utils.py                           |   27 -
 django_airavata/wagtailapps/base/blocks.py         |   46 +
 .../base/templatetags/navigation_tags.py           |    8 +
 django_airavata/wagtailapps/base/wagtail_hooks.py  |   56 +-
 docs/assets/css/pymdownx.tabbed.css                |   47 +
 docs/dev/custom_django_app.md                      |  295 ++---
 docs/dev/custom_output_view_provider.md            |  121 +-
 docs/dev/new_django_app.md                         |    2 +-
 ...{gateways_tutorial.md => custom_ui_tutorial.md} | 1180 ++++++++++++--------
 .../screenshots/custom-ui/custom-app-menu.png      |  Bin 0 -> 177809 bytes
 .../gaussian-output-view-providers-json.png        |  Bin 0 -> 31419 bytes
 .../screenshots/custom-ui/settings_menu.png        |  Bin 0 -> 181704 bytes
 mkdocs.yml                                         |    6 +-
 requirements-dev.txt                               |    3 +-
 requirements.txt                                   |    7 +-
 setup.py                                           |    1 -
 tests/settings.py                                  |    4 -
 72 files changed, 3074 insertions(+), 1083 deletions(-)