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 2020/02/11 20:01:33 UTC

[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3294--Gateway-PI-having-issues-login-in-to-the-gateway-using-local-account-and-CILogon' 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 64243ef6c718db832140a2e5b41aba361362de77
Merge: 8ba99f3 0f95e9a
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Feb 11 15:01:13 2020 -0500

    Merge branch 'AIRAVATA-3294--Gateway-PI-having-issues-login-in-to-the-gateway-using-local-account-and-CILogon' into develop

 .prettierrc                                        |   3 +
 django_airavata/apps/auth/views.py                 |  13 +-
 .../output-displays/HtmlOutputDisplay.vue          |  37 +++-
 docs/dev/custom_django_app.md                      | 206 ++++++++++++++++++---
 docs/dev/new_django_app.md                         |  19 +-
 5 files changed, 228 insertions(+), 50 deletions(-)