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 5889a7c8570db794d12d76dd6efb7fd1d5c3f67f Merge: 550870b9 8db03aa7 Author: Marcus Christie <[email protected]> AuthorDate: Thu Apr 27 09:15:20 2023 -0400 Merge branch 'master' into delta-topology-workshop .github/workflows/build-and-test.yaml | 15 + django_airavata/apps/admin/management/__init__.py | 0 .../apps/admin/management/commands/__init__.py | 0 .../admin/management/commands/archive_user_data.py | 162 ++++++++ .../management/commands/unarchive_user_data.py | 42 +++ .../apps/admin/migrations/0001_initial.py | 35 ++ django_airavata/apps/admin/models.py | 15 + .../statistics/ExperimentDetailsView.vue | 18 +- .../ExperimentStatisticsContainer.spec.js | 9 + .../api/static/django_airavata_api/js/index.js | 1 + .../django_airavata_api/js/service_config.js | 9 + django_airavata/apps/api/thrift_utils.py | 2 +- django_airavata/apps/api/urls.py | 3 + django_airavata/apps/api/views.py | 37 +- django_airavata/apps/auth/backends.py | 2 +- .../storage/ExperimentStorageViewContainer.vue | 23 ++ django_airavata/apps/workspace/views.py | 4 +- django_airavata/settings.py | 7 + django_airavata/settings_local.py.sample | 8 + django_airavata/static/common/package.json | 9 +- django_airavata/static/common/yarn.lock | 414 ++++++++++++++++++++- requirements.txt | 2 +- 22 files changed, 794 insertions(+), 23 deletions(-)
