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 <[email protected]>
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(-)

Reply via email to