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 a4b137617bdc5800f1b4d891d2bd36fdf36feb56 Merge: de9d0aae de6bc7c1 Author: Marcus Christie <[email protected]> AuthorDate: Mon Feb 6 09:30:41 2023 -0500 Merge branch 'staging' .github/workflows/build-and-test.yaml | 93 + README.md | 4 +- django_airavata/apps/admin/jest.config.js | 9 + django_airavata/apps/admin/package.json | 28 +- .../statistics/ExperimentStatisticsContainer.vue | 169 +- .../users/ExtendedUserProfileContainer.vue | 15 +- .../ExtendedUserProfileFieldEditor.vue | 53 +- .../tests/__mocks__/styleMock.js | 1 + .../ExperimentStatisticsContainer.spec.js | 145 ++ django_airavata/apps/admin/yarn.lock | 2652 +++++++++++++++++++- django_airavata/apps/api/exceptions.py | 11 +- .../js/models/ExtendedUserProfileField.js | 1 + django_airavata/apps/auth/serializers.py | 7 +- test_js.sh | 1 + 14 files changed, 3051 insertions(+), 138 deletions(-)
