This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 4b0ac0efd8839ff2c0e11fdcbb99ce32fcb98992 Merge: 34be846 cd47d63 Author: Marcus Christie <[email protected]> AuthorDate: Wed Sep 30 19:05:52 2020 -0400 Merge branch 'merge-AIRAVATA-3346' into develop django_airavata/apps/api/authentication.py | 35 ++++++++ django_airavata/apps/api/serializers.py | 60 ++++++++++--- django_airavata/apps/api/views.py | 137 ++++++++++++++++++----------- django_airavata/apps/auth/backends.py | 26 ++++++ django_airavata/apps/auth/utils.py | 27 ++++-- django_airavata/apps/auth/views.py | 4 + django_airavata/apps/workspace/views.py | 7 -- django_airavata/middleware.py | 28 +++--- django_airavata/settings.py | 1 + 9 files changed, 229 insertions(+), 96 deletions(-)
