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/02/06 14:31:04 UTC
[airavata-django-portal] 02/02: Merge branch 'master' into delta-topology-workshop
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 292ada4838a29f8e9834f09d12a839c9e50bca1d
Merge: 4c1789fa a4b13761
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Feb 6 09:30:49 2023 -0500
Merge branch 'master' into delta-topology-workshop
.asf.yaml | 40 +
.github/workflows/build-and-test.yaml | 93 +
.travis.yml | 25 -
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 +-
django_airavata/apps/workspace/yarn.lock | 68 +-
requirements.txt | 4 +-
test_js.sh | 1 +
18 files changed, 3133 insertions(+), 193 deletions(-)