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 2021/10/06 13:14:46 UTC
[airavata-django-portal] 01/01: 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 3bdc4ebef8b25f43d753b9b59d85f961cfc850ca
Merge: f3a194b 6f2f237
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 6 09:14:16 2021 -0400
Merge branch 'master' into delta-topology-workshop
django_airavata/apps/admin/package.json | 2 +-
.../ComputeResourceReservationList.vue | 6 +-
.../GroupComputeResourcePreference.vue | 6 +-
.../applications/ApplicationDeploymentsList.vue | 2 +-
.../ComputeResourcePreferenceDashboard.vue | 4 +-
.../dashboards/CredentialStoreDashboard.vue | 10 +-
.../gatewayprofile/StoragePreferenceList.vue | 6 +-
.../notices/NoticesManagementContainer.vue | 6 +-
.../statistics/ExperimentStatisticsContainer.vue | 10 +-
.../IdentityServiceUserManagementContainer.vue | 6 +-
.../UnverifiedEmailUserManagementContainer.vue | 2 +-
django_airavata/apps/admin/urls.py | 25 +-
django_airavata/apps/admin/yarn.lock | 74 +-
django_airavata/apps/api/signals.py | 3 +-
.../django_airavata_api/js/errors/ErrorUtils.js | 3 +
django_airavata/apps/api/thrift_utils.py | 4 +-
django_airavata/apps/api/urls.py | 109 +-
django_airavata/apps/api/views.py | 14 +-
.../django_airavata_auth/create_account.html | 2 +-
django_airavata/apps/auth/urls.py | 56 +-
django_airavata/apps/auth/yarn.lock | 67 +-
django_airavata/apps/dataparsers/urls.py | 12 +-
django_airavata/apps/groups/package.json | 1 -
.../js/group_components/GroupEditor.vue | 9 +-
.../GroupMembersDetailsContainer.vue | 72 +
.../js/group_components/GroupMembersEditor.vue | 472 ++-
django_airavata/apps/groups/urls.py | 8 +-
django_airavata/apps/groups/yarn.lock | 4386 ++++++++++----------
django_airavata/apps/workspace/package.json | 2 +-
.../components/storage/UserStoragePathViewer.vue | 6 +-
.../js/containers/EditExperimentContainer.vue | 13 +-
.../js/containers/ExperimentListContainer.vue | 158 +-
.../js/containers/RecentExperimentsContainer.vue | 13 +-
django_airavata/apps/workspace/urls.py | 26 +-
django_airavata/apps/workspace/yarn.lock | 74 +-
django_airavata/settings.py | 2 +
.../common/js/components/ApplicationName.vue | 11 +-
django_airavata/static/common/package.json | 2 +-
django_airavata/static/common/yarn.lock | 74 +-
django_airavata/urls.py | 38 +-
.../wagtailapps/base/fixtures/tests/default.json | 9 +-
.../base/migrations/0026_auto_20210923_2212.py | 48 +
docs/assets/js/clipboard.min.js | 7 +
docs/assets/js/clipboard_init.js | 1 +
docs/dev/new_django_app.md | 4 +-
docs/tutorial/custom_ui_tutorial.md | 199 +-
mkdocs.yml | 4 +
requirements.txt | 8 +-
48 files changed, 3415 insertions(+), 2661 deletions(-)