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 2022/10/25 16:50:09 UTC

[airavata-django-portal] 01/01: Merge branch 'master' into develop

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 7ee4b6a0a36ff5c41d2bee565ceb0de54e275831
Merge: 9f649b21 c44a08b6
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Oct 25 12:49:49 2022 -0400

    Merge branch 'master' into develop

 .../login-desktop-success.html                     |  8 +--
 .../partials/externals_login_form.html             |  2 +-
 .../partials/username_password_login_form.html     |  6 ++
 django_airavata/apps/auth/views.py                 | 69 +++++++++++++---------
 4 files changed, 51 insertions(+), 34 deletions(-)