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 2021/10/28 18:45:27 UTC

[airavata-django-portal] branch develop updated (82cc848 -> 3e7f068)

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.


    from 82cc848  AIRAVATA-3529 Wait for travis to support 3.10
     add b184fbc  AIRAVATA-3530 Re-exporting new_default_theme with migrated embed hash
     add c71a297  AIRAVATA-3532 Bump sdk to 1.2.3
     add b93cfb4  AIRAVATA-3534 Fix formatting of FROM email address when sending admins new user email
     new 3e7f068  Merge branch 'master' into develop

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 django_airavata/apps/auth/tests/test_views.py      |  55 +++-
 django_airavata/apps/auth/utils.py                 |  10 +-
 .../base/fixtures/new_default_theme.json           | 284 ++++++++++++++++++---
 requirements.txt                                   |   2 +-
 4 files changed, 306 insertions(+), 45 deletions(-)

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

Posted by ma...@apache.org.
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 3e7f0684b05a7a29f6c380d7b56da29eae1709db
Merge: 82cc848 b93cfb4
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Oct 28 14:45:09 2021 -0400

    Merge branch 'master' into develop

 django_airavata/apps/auth/tests/test_views.py      |  55 +++-
 django_airavata/apps/auth/utils.py                 |  10 +-
 .../base/fixtures/new_default_theme.json           | 284 ++++++++++++++++++---
 requirements.txt                                   |   2 +-
 4 files changed, 306 insertions(+), 45 deletions(-)