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/07/01 20:45:52 UTC

[airavata-django-portal] 01/01: Merge branch 'hidden-username-password-login' 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 ad7f7626ad5f0055b7a6482cf1212c7913a40d2a
Merge: 39e224a 17694cf
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jul 1 16:45:29 2020 -0400

    Merge branch 'hidden-username-password-login' into develop

 .../src/components/statistics/ExperimentDetailsView.vue               | 4 ++++
 .../apps/auth/templates/django_airavata_auth/create_account.html      | 2 +-
 .../apps/auth/templates/django_airavata_auth/login-desktop.html       | 2 +-
 django_airavata/apps/auth/templates/django_airavata_auth/login.html   | 2 +-
 .../js/components/experiment/ExperimentSummary.vue                    | 4 ++++
 django_airavata/settings_local.py.sample                              | 2 ++
 6 files changed, 13 insertions(+), 3 deletions(-)