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:21 UTC

[airavata-django-portal] branch simccs updated (95fa21c -> f4f0c6b)

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

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


    from 95fa21c  Merge pull request #14 from gowtham06/simccs
     add 466c2b9  Remove IU CSS
     add 70c9b84  AIRAVATA-2857 Nav items can show/hide based on logged in status
     new f4f0c6b  Merge branch 'master' into simccs

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/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(-)
 create mode 100644 django_airavata/templates/blocks/bootstrap/nav-item.html
 create mode 100644 django_airavata/templates/blocks/bootstrap/nav.html
 create mode 100644 django_airavata/wagtailapps/base/migrations/0018_auto_20181010_0136.py

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

Posted by ma...@apache.org.
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(-)