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 2023/09/26 14:11:57 UTC

[airavata-django-portal] branch develop updated (17d744dd -> 186a8c18)

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

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


    from 17d744dd Merge branch 'AIRAVATA-3702--User-input-files-renamed-with-random-extension-when-experiment-launched' into develop
     add e456c6fe Run build and test GA on PRs
     add bd0c4d0c README Change. Added Windows command note.
     add 4c111089 Added webpack 5.0.0 dependency needed for webpack-bundle-tracker
     add e7685cfb Reverting changes that were not needed. Add Windows note to REDME
     add 57d5ceef retrigger checks
     add 42828901 Merge pull request #185 from jcford2213/master
     add 18cd1ab1 Adding build.os to .readthedocs.yaml
     add dd41406b AIRAVATA-3698 management command to fix up the content type id in page revision json
     add 75ff2835 Merge pull request #186 from apache/AIRAVATA-3698-fix-page-revision-content-type
     new 186a8c18 Merge branch 'master' into develop

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:
 .github/workflows/build-and-test.yaml              |   2 +-
 .readthedocs.yaml                                  |   8 +-
 README.md                                          |   3 +
 django_airavata/apps/auth/package.json             |   9 +-
 django_airavata/apps/auth/yarn.lock                | 501 ++++++++++++++++++++-
 .../commands/fix_page_revision_content_type.py     |  23 +
 .../base/management/commands/load_cms_data.py      |   5 +-
 .../management/commands/load_cybergateway_data.py  |  25 -
 .../management/commands/load_default_gateway.py    |  25 -
 .../management/commands/load_hpcgateway_data.py    |  25 -
 .../commands/load_nanoconfinement_data.py          |  25 -
 .../base/management/commands/load_osu_data.py      |  25 -
 .../base/management/commands/load_phasta_data.py   |  25 -
 .../base/management/commands/load_seagrid_data.py  |  25 -
 .../management/commands/load_searching_sra_data.py |  25 -
 .../base/management/commands/load_simccs_data.py   |  25 -
 .../management/commands/load_simvascular_data.py   |  25 -
 .../base/management/commands/load_siu_data.py      |  25 -
 .../management/commands/load_south_dakota_data.py  |  25 -
 .../base/management/commands/set_wagtail_site.py   |   6 +-
 requirements-dev.txt                               | Bin 237 -> 506 bytes
 21 files changed, 539 insertions(+), 318 deletions(-)
 create mode 100644 django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_default_gateway.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_osu_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_phasta_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simccs_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_siu_data.py
 delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py

[airavata-django-portal] 01/01: Merge branch 'master' into develop

Posted by ma...@apache.org.
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 186a8c18da3480ffbcc4dd7a9811c58d82caa8ce
Merge: 17d744dd 75ff2835
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Sep 26 10:11:06 2023 -0400

    Merge branch 'master' into develop

 .github/workflows/build-and-test.yaml              |   2 +-
 .readthedocs.yaml                                  |   8 +-
 README.md                                          |   3 +
 django_airavata/apps/auth/package.json             |   9 +-
 django_airavata/apps/auth/yarn.lock                | 501 ++++++++++++++++++++-
 .../commands/fix_page_revision_content_type.py     |  23 +
 .../base/management/commands/load_cms_data.py      |   5 +-
 .../management/commands/load_cybergateway_data.py  |  25 -
 .../management/commands/load_default_gateway.py    |  25 -
 .../management/commands/load_hpcgateway_data.py    |  25 -
 .../commands/load_nanoconfinement_data.py          |  25 -
 .../base/management/commands/load_osu_data.py      |  25 -
 .../base/management/commands/load_phasta_data.py   |  25 -
 .../base/management/commands/load_seagrid_data.py  |  25 -
 .../management/commands/load_searching_sra_data.py |  25 -
 .../base/management/commands/load_simccs_data.py   |  25 -
 .../management/commands/load_simvascular_data.py   |  25 -
 .../base/management/commands/load_siu_data.py      |  25 -
 .../management/commands/load_south_dakota_data.py  |  25 -
 .../base/management/commands/set_wagtail_site.py   |   6 +-
 requirements-dev.txt                               | Bin 237 -> 506 bytes
 21 files changed, 539 insertions(+), 318 deletions(-)