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/13 15:31:01 UTC
[airavata-django-portal] branch master updated (17694cf -> 0c09590)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 17694cf Document hidden username password option
add 27b2667 AIRAVATA-3347 Add `interval` to BootstrapCarousel block
new 0c09590 Merge branch 'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous'
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/static/common/js/cms.js | 4 ----
.../templates/blocks/bootstrap/carousel.html | 2 +-
django_airavata/wagtailapps/base/blocks.py | 4 ++++
...20191106_1542.py => 0024_auto_20200624_1925.py} | 24 ++++++++--------------
4 files changed, 13 insertions(+), 21 deletions(-)
copy django_airavata/wagtailapps/base/migrations/{0022_auto_20191106_1542.py => 0024_auto_20200624_1925.py} (55%)
[airavata-django-portal] 01/01: Merge branch
'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 0c0959042da406c5de8b7a02c79b471da0661fe0
Merge: 17694cf 27b2667
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jul 13 11:29:51 2020 -0400
Merge branch 'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous'
django_airavata/static/common/js/cms.js | 4 --
.../templates/blocks/bootstrap/carousel.html | 2 +-
django_airavata/wagtailapps/base/blocks.py | 4 ++
.../base/migrations/0024_auto_20200624_1925.py | 50 ++++++++++++++++++++++
4 files changed, 55 insertions(+), 5 deletions(-)