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/06/24 19:05:00 UTC
[airavata-django-portal] 01/01: Merge branch
'AIRAVATA-3306-wagtail-allow-specifying-a-container-for-page-row'
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 72fb1504c59c45a46b8270dfbed9ffef62f5b653
Merge: 0804f48 26d4c00
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jun 24 15:04:42 2020 -0400
Merge branch 'AIRAVATA-3306-wagtail-allow-specifying-a-container-for-page-row'
django_airavata/settings.py | 1 +
.../templates/blocks/bootstrap/container.html | 13 ++
.../django_airavata_wagtail_base/blank_page.html | 19 +-
django_airavata/wagtailapps/base/blocks.py | 46 ++++
.../0023_rowblankpagerelation_container.py | 23 ++
django_airavata/wagtailapps/base/models.py | 24 +-
docs/cms.md | 257 +++++++++++----------
docs/images/banner_image.png | Bin 0 -> 274018 bytes
docs/images/panel.png | Bin 169997 -> 191318 bytes
requirements-dev.txt | 1 +
10 files changed, 259 insertions(+), 125 deletions(-)