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 33ce146a2b67a3e4beef4d6bc298df1d2e280cc6 Merge: b094fbf9 0e2736ba Author: Marcus Christie <[email protected]> AuthorDate: Wed Nov 2 13:51:21 2022 -0400 Merge branch 'master' into delta-topology-workshop .nvmrc | 2 +- django_airavata/app_config.py | 49 ---- .../users/ExtendedUserProfileContainer.vue | 35 +-- .../components/users/ExtendedUserProfilePanel.vue | 14 +- .../ExtendedUserProfileFieldEditor.vue | 36 ++- .../src/store/modules/extendedUserProfile.js | 3 + django_airavata/apps/api/exceptions.py | 10 +- .../django_airavata_api/js/errors/ErrorUtils.js | 34 +++ .../js/errors/UnhandledError.js | 6 + .../js/errors/UnhandledErrorDispatcher.js | 14 +- .../django_airavata_api/js/utils/FetchUtils.js | 4 +- django_airavata/apps/api/tests/test_views.py | 23 ++ django_airavata/apps/api/views.py | 2 +- .../js/containers/UserProfileContainer.vue | 14 +- .../login-desktop-success.html | 3 + .../partials/externals_login_form.html | 2 +- .../partials/username_password_login_form.html | 6 + django_airavata/apps/auth/views.py | 80 ++++--- django_airavata/context_processors.py | 28 +-- django_airavata/settings.py | 43 +--- .../common/js/components/NotificationsDisplay.vue | 49 +++- django_airavata/static/common/scss/main.scss | 5 + django_airavata/urls.py | 19 +- docs/tutorial/custom_ui_tutorial.md | 252 ++++++++++++--------- requirements.txt | 1 + tests/settings.py | 5 +- 26 files changed, 434 insertions(+), 305 deletions(-)
