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 714b542dc62d68060f060403ad80744cfadef0b2
Merge: 3fc8207 26d4c00
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Mon May 4 11:42:14 2020 -0400
Merge branch
'AIRAVATA-3306-wagtail-allow-specifying-a-container-for-page-row' into develop
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(-)
