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 4c1789fad507ce0f593f8031aaa7c0fc5eb30515
Merge: 33ce146a 4c8a01fd
Author: Marcus Christie <[email protected]>
AuthorDate: Thu Dec 15 09:01:18 2022 -0500

    Merge branch 'master' into delta-topology-workshop

 .nvmrc                                             |    2 +-
 .travis.yml                                        |    3 +-
 README.md                                          |    2 +
 build_js.bat                                       |    6 +-
 django_airavata/apps/admin/babel.config.js         |    2 +-
 django_airavata/apps/admin/package.json            |   16 +-
 .../ComputeResourceReservationList.vue             |    1 -
 .../applications/ApplicationDeploymentsList.vue    |   10 +-
 .../applications/ApplicationModuleEditor.vue       |    5 +-
 .../gatewayprofile/StoragePreferenceList.vue       |   10 +-
 .../src/components/notices/NoticeEditor.vue        |    2 +-
 .../notices/NoticesManagementContainer.vue         |    2 +-
 .../users/ExtendedUserProfileContainer.vue         |   15 +-
 .../src/components/users/UserDetailsContainer.vue  |    2 -
 .../ExtendedUserProfileFieldEditor.vue             |   15 +-
 django_airavata/apps/admin/vue.config.js           |   46 -
 django_airavata/apps/admin/yarn.lock               | 7611 +++++++--------
 django_airavata/apps/api/package.json              |    3 +-
 django_airavata/apps/api/yarn.lock                 | 1926 ++--
 django_airavata/apps/auth/babel.config.js          |    2 +-
 .../auth/migrations/0019_auto_20221118_1323.py     |   24 +
 django_airavata/apps/auth/package.json             |   20 +-
 .../js/containers/UserProfileContainer.vue         |   22 +-
 .../js/store/modules/extendedUserProfile.js        |    3 +
 django_airavata/apps/auth/vue.config.js            |   62 +-
 django_airavata/apps/auth/yarn.lock                | 9039 ++++++++----------
 django_airavata/apps/dataparsers/babel.config.js   |    2 +-
 django_airavata/apps/dataparsers/package.json      |   19 +-
 django_airavata/apps/dataparsers/vue.config.js     |   52 -
 django_airavata/apps/dataparsers/yarn.lock         | 7216 ++++++++-------
 django_airavata/apps/groups/babel.config.js        |    2 +-
 django_airavata/apps/groups/package.json           |   19 +-
 django_airavata/apps/groups/vue.config.js          |   52 -
 django_airavata/apps/groups/yarn.lock              | 6627 ++++++-------
 django_airavata/apps/workspace/babel.config.js     |    2 +-
 .../package.json                                   |   21 +-
 .../django-airavata-workspace-plugin-api/yarn.lock | 7810 ++++++++--------
 django_airavata/apps/workspace/jest.config.js      |    3 +-
 django_airavata/apps/workspace/package.json        |   25 +-
 .../js/components/experiment/ExperimentEditor.vue  |    6 +-
 .../js/components/experiment/ExperimentSummary.vue |   14 +
 .../experiment/GroupResourceProfileSelector.vue    |   19 +-
 .../components/storage/UserStoragePathViewer.vue   |    6 -
 .../js/store/modules/view-experiment.js            |   14 +
 .../django_airavata_workspace/js/utils/urls.js     |    5 +
 django_airavata/apps/workspace/vue.config.js       |   48 -
 django_airavata/apps/workspace/yarn.lock           | 9779 +++++++++++---------
 django_airavata/settings.py                        |    3 +
 django_airavata/static/common/babel.config.js      |    2 +-
 .../js/components/GatewayNoticesContainer.vue      |    9 +-
 .../static/common/js/components/Linkify.vue        |    1 +
 .../static/common/js/components/Pager.vue          |    1 +
 .../static/common/js/components/Sidebar.vue        |    1 +
 .../static/common/js/components/Uppy.vue           |    1 +
 .../static/common/js/errors/ValidationErrors.js    |    2 +-
 django_airavata/static/common/package.json         |   21 +-
 django_airavata/static/common/yarn.lock            | 9255 ++++++++----------
 docs/dev/new_django_app.md                         |  257 +-
 requirements.txt                                   |   11 +-
 tox.ini                                            |    4 +-
 60 files changed, 29547 insertions(+), 30613 deletions(-)


Reply via email to