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 2018/10/10 13:28:22 UTC

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

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

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

commit f4f0c6bef72e0eaf6f866d81d87319f99bbb3d79
Merge: 95fa21c 70c9b84
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 10 09:28:08 2018 -0400

    Merge branch 'master' into simccs

 django_airavata/apps/auth/views.py                 |  4 +-
 django_airavata/settings.py                        |  2 +-
 .../templates/blocks/bootstrap/nav-item.html       | 21 ++++++
 .../templates/blocks/bootstrap/nav.html            |  7 ++
 .../includes/nav_extra.html                        | 28 +------
 django_airavata/templates/includes/head-extra.html |  7 --
 django_airavata/wagtailapps/base/blocks.py         | 69 +++++++++++++++++
 .../base/migrations/0018_auto_20181010_0136.py     | 80 ++++++++++++++++++++
 django_airavata/wagtailapps/base/models.py         | 88 +++-------------------
 .../base/templatetags/navigation_tags.py           |  4 +-
 10 files changed, 196 insertions(+), 114 deletions(-)