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/06/03 21:59:21 UTC

[airavata-django-portal] branch develop updated (911a0f7 -> 304016b)

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 911a0f7  Merge pull request #61 from akbranam/AIRAVATA-3321-GRP-Readonly-View
     add f4d2599  AIRAVATA-3465 Upgrading wagtail to 2.9.3
     add 3536456  AIRAVATA-3465 Adding Wagtail Draftail Anchors plugin
     add 160ed99  AIRAVATA-3465 Upgrading Wagtail to 2.10.2
     add ba33fdb  AIRAVATA-3465 add id to headings for anchor links
     add e639195  AIRAVATA-3465 Upgrading Wagtail to 2.11 (latest LTS)
     add 3a8b585  AIRAVATA-3465 Upgrading DRF to be compatible with Wagtail 2.11
     new 3f08100  Merge branch 'airavata-3465' into develop
     add f9ba64e  Document and test support for Python 3.9
     new 304016b  Merge branch 'python39' into develop

The 2 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:
 .travis.yml                                                      | 2 ++
 README.md                                                        | 6 +++---
 django_airavata/settings.py                                      | 2 +-
 django_airavata/templates/blocks/heading_block.html              | 8 ++++----
 django_airavata/wagtailapps/base/templatetags/navigation_tags.py | 4 ++--
 requirements.txt                                                 | 7 ++++---
 tox.ini                                                          | 4 ++--
 7 files changed, 18 insertions(+), 15 deletions(-)

[airavata-django-portal] 01/02: Merge branch 'airavata-3465' 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 3f081003b87d2532465a63303599da34665463c9
Merge: 911a0f7 3a8b585
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 3 17:58:48 2021 -0400

    Merge branch 'airavata-3465' into develop

 django_airavata/settings.py                                      | 2 +-
 django_airavata/templates/blocks/heading_block.html              | 8 ++++----
 django_airavata/wagtailapps/base/templatetags/navigation_tags.py | 4 ++--
 requirements.txt                                                 | 7 ++++---
 4 files changed, 11 insertions(+), 10 deletions(-)

[airavata-django-portal] 02/02: Merge branch 'python39' 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 304016bbc17453eef77f3ba2678be112e7a4df83
Merge: 3f08100 f9ba64e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 3 17:58:53 2021 -0400

    Merge branch 'python39' into develop

 .travis.yml | 2 ++
 README.md   | 6 +++---
 tox.ini     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)