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 2021/06/02 21:45:51 UTC
[airavata-django-portal] branch airavata-3465 created (now e639195)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch airavata-3465
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
at e639195 AIRAVATA-3465 Upgrading Wagtail to 2.11 (latest LTS)
This branch includes the following new commits:
new f4d2599 AIRAVATA-3465 Upgrading wagtail to 2.9.3
new 3536456 AIRAVATA-3465 Adding Wagtail Draftail Anchors plugin
new 160ed99 AIRAVATA-3465 Upgrading Wagtail to 2.10.2
new ba33fdb AIRAVATA-3465 add id to headings for anchor links
new e639195 AIRAVATA-3465 Upgrading Wagtail to 2.11 (latest LTS)
The 5 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.
[airavata-django-portal] 05/05: AIRAVATA-3465 Upgrading Wagtail to
2.11 (latest LTS)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-3465
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit e639195371533517ca5a551a0b77505b07551cb0
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 1 18:05:39 2021 -0400
AIRAVATA-3465 Upgrading Wagtail to 2.11 (latest LTS)
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 2a8c89c..298feac 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ thrift_connector==0.24
djangorestframework==3.10.3
django-webpack-loader==0.6.0
-wagtail==2.10.2
+wagtail==2.11.7
wagtailfontawesome==1.2.1
wagtail-draftail-anchors==0.2.0
[airavata-django-portal] 03/05: AIRAVATA-3465 Upgrading Wagtail to
2.10.2
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-3465
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 160ed994a0c00cb6fb779b26038eceb32a59bfa8
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri May 28 18:00:38 2021 -0400
AIRAVATA-3465 Upgrading Wagtail to 2.10.2
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 70242fa..2a8c89c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ thrift_connector==0.24
djangorestframework==3.10.3
django-webpack-loader==0.6.0
-wagtail==2.9.3
+wagtail==2.10.2
wagtailfontawesome==1.2.1
wagtail-draftail-anchors==0.2.0
[airavata-django-portal] 01/05: AIRAVATA-3465 Upgrading wagtail to
2.9.3
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-3465
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit f4d2599b556f6e77f8a9d60de19ee503c3f6c6bc
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu May 27 18:02:36 2021 -0400
AIRAVATA-3465 Upgrading wagtail to 2.9.3
---
django_airavata/settings.py | 1 -
django_airavata/wagtailapps/base/templatetags/navigation_tags.py | 4 ++--
requirements.txt | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/django_airavata/settings.py b/django_airavata/settings.py
index 8888066..16628e1 100644
--- a/django_airavata/settings.py
+++ b/django_airavata/settings.py
@@ -128,7 +128,6 @@ MIDDLEWARE = [
# profile_service_client
'django_airavata.apps.auth.middleware.gateway_groups_middleware',
# Wagtail related middleware
- 'wagtail.core.middleware.SiteMiddleware',
'wagtail.contrib.redirects.middleware.RedirectMiddleware',
]
diff --git a/django_airavata/wagtailapps/base/templatetags/navigation_tags.py b/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
index 1291564..eaa92bc 100644
--- a/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
+++ b/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
@@ -1,6 +1,6 @@
from django import template
from django.conf import settings
-from wagtail.core.models import Page
+from wagtail.core.models import Page, Site
from django_airavata.wagtailapps.base.models import (
Announcements,
@@ -23,7 +23,7 @@ def get_site_root(context):
# This returns a core.Page. The main menu needs to have the site.root_page
# defined else will return an object attribute error ('str' object has no
# attribute 'get_children')
- return context['request'].site.root_page
+ return Site.find_for_request(context['request']).root_page
def has_menu_children(page):
diff --git a/requirements.txt b/requirements.txt
index 1d50ed9..07f1eb9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
# Pin these dependencies
-Django>=2.2,<2.3
+Django==2.2.23
requests==2.13.0
requests-oauthlib==0.7.0
thrift==0.10.0
@@ -7,7 +7,7 @@ thrift_connector==0.24
djangorestframework==3.10.3
django-webpack-loader==0.6.0
-wagtail>=2.7,<2.8
+wagtail==2.9.3
wagtailfontawesome==1.2.1
jupyter==1.0.0
[airavata-django-portal] 04/05: AIRAVATA-3465 add id to headings
for anchor links
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-3465
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit ba33fdb2e89a4d2064ee78799b22f5bd6742f90e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 1 17:59:12 2021 -0400
AIRAVATA-3465 add id to headings for anchor links
---
django_airavata/templates/blocks/heading_block.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/django_airavata/templates/blocks/heading_block.html b/django_airavata/templates/blocks/heading_block.html
index f3d0c3f..cb61c17 100644
--- a/django_airavata/templates/blocks/heading_block.html
+++ b/django_airavata/templates/blocks/heading_block.html
@@ -1,15 +1,15 @@
<div class="{{self.custom_class}}">
{% if self.size == 'h1' %}
- <h1>{{ self.heading_text }}</h1>
+ <h1 id="{{ self.heading_text | slugify }}">{{ self.heading_text }}</h1>
{% elif self.size == 'h2' %}
- <h2>{{ self.heading_text }}</h2>
+ <h2 id="{{ self.heading_text | slugify }}">{{ self.heading_text }}</h2>
{% elif self.size == 'h3' %}
- <h3>{{ self.heading_text }}</h3>
+ <h3 id="{{ self.heading_text | slugify }}">{{ self.heading_text }}</h3>
{% elif self.size == 'h4' %}
- <h4>{{ self.heading_text }}</h4>
+ <h4 id="{{ self.heading_text | slugify }}">{{ self.heading_text }}</h4>
{% endif %}
</div>
[airavata-django-portal] 02/05: AIRAVATA-3465 Adding Wagtail
Draftail Anchors plugin
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-3465
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 35364562a242d728fc51a7cf07be669da442ffdc
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri May 28 18:00:11 2021 -0400
AIRAVATA-3465 Adding Wagtail Draftail Anchors plugin
---
django_airavata/settings.py | 1 +
requirements.txt | 1 +
2 files changed, 2 insertions(+)
diff --git a/django_airavata/settings.py b/django_airavata/settings.py
index 16628e1..ac592f1 100644
--- a/django_airavata/settings.py
+++ b/django_airavata/settings.py
@@ -68,6 +68,7 @@ INSTALLED_APPS = [
'modelcluster',
'taggit',
'wagtailfontawesome',
+ 'wagtail_draftail_anchors',
# wagtail custom apps
'django_airavata.wagtailapps.base.apps.BaseConfig',
diff --git a/requirements.txt b/requirements.txt
index 07f1eb9..70242fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@ django-webpack-loader==0.6.0
wagtail==2.9.3
wagtailfontawesome==1.2.1
+wagtail-draftail-anchors==0.2.0
jupyter==1.0.0
papermill==1.0.1