Skip to content

Commit

Permalink
[Closes #3661] django 1.11 LTS support on master
Browse files Browse the repository at this point in the history
  • Loading branch information
afabiani committed Apr 16, 2018
1 parent b17b40a commit 5972d18
Show file tree
Hide file tree
Showing 9 changed files with 105 additions and 5 deletions.
23 changes: 23 additions & 0 deletions geonode/documents/migrations/0033_auto_20180414_2120.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-14 21:20
from __future__ import unicode_literals

from django.db import migrations
import django.db.models.manager


class Migration(migrations.Migration):

dependencies = [
('documents', '0032_auto_20180412_0822'),
]

operations = [
migrations.AlterModelManagers(
name='document',
managers=[
('objects', django.db.models.manager.Manager()),
('base_objects', django.db.models.manager.Manager()),
],
),
]
10 changes: 10 additions & 0 deletions geonode/layers/templates/layers/layer_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ <h2 class="page-title">{% trans "Explore Layers" %}</h2>

{% block extra_script %}
{{ block.super }}

<script type="text/javascript">
// $window.scrollTo(0, 0);
$( document ).ready(function() {
$('body,html').animate({
scrollTop: 0
}, 600);
});
</script>

{% if GEONODE_SECURITY_ENABLED %}
{% include "_permissions_form_js.html" %}
{% endif %}
Expand Down
23 changes: 23 additions & 0 deletions geonode/maps/migrations/0030_auto_20180414_2120.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-14 21:20
from __future__ import unicode_literals

from django.db import migrations
import django.db.models.manager


class Migration(migrations.Migration):

dependencies = [
('maps', '0029_auto_20180412_0822'),
]

operations = [
migrations.AlterModelManagers(
name='map',
managers=[
('objects', django.db.models.manager.Manager()),
('base_objects', django.db.models.manager.Manager()),
],
),
]
21 changes: 21 additions & 0 deletions geonode/people/migrations/0027_auto_20180414_2120.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-14 21:20
from __future__ import unicode_literals

import django.contrib.auth.validators
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('people', '0026_auto_20171120_0730'),
]

operations = [
migrations.AlterField(
model_name='profile',
name='username',
field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'),
),
]
2 changes: 1 addition & 1 deletion geonode/people/templates/people/profile_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ <h3>{{ profile.first_name|default:profile.name_long }}</h3>
</ul>
<ul class="list-group">
{% if USE_NOTIFICATIONS %}
<li class="list-group-item"><a href="{% url "notice_settings" %}"><i class="fa fa-bell"></i> {% trans "Notifications" %}</a></li>
<li class="list-group-item"><a href="{% url "pinax_notifications:notice_settings" %}"><i class="fa fa-bell"></i> {% trans "Notifications" %}</a></li>
{% endif %}
{% if perms.announcements.can_manage %}
<li class="list-group-item"><a href="{% url "announcements_list" %}"><i class="fa fa-bullhorn"></i> {% trans "Announcements" %}</a></li>
Expand Down
23 changes: 23 additions & 0 deletions geonode/services/migrations/0039_auto_20180414_2120.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-14 21:20
from __future__ import unicode_literals

from django.db import migrations
import django.db.models.manager


class Migration(migrations.Migration):

dependencies = [
('services', '0038_auto_20180412_0822'),
]

operations = [
migrations.AlterModelManagers(
name='service',
managers=[
('objects', django.db.models.manager.Manager()),
('base_objects', django.db.models.manager.Manager()),
],
),
]
2 changes: 1 addition & 1 deletion geonode/templates/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Menu" %}</h4>
<li><a href="{% url "recent-activity" %}"><i class="fa fa-fire"></i> {% trans "Recent Activity" %}</a></li>
<li><a href="{% url "messages_inbox" %}"><i class="fa fa-inbox"></i> {% trans "Inbox" %}</a></li>
{% if USE_NOTIFICATIONS %}
<li><a href="{% url "notice_settings" %}"><i class="fa fa-bell"></i> {% trans "Notifications" %}</a></li>
<li><a href="{% url "pinax_notifications:notice_settings" %}"><i class="fa fa-bell"></i> {% trans "Notifications" %}</a></li>
{% endif %}
{% if perms.announcements.can_manage %}
<li><a href="{% url "announcements_list" %}"><i class="fa fa-bullhorn"></i> {% trans "Announcements" %}</a></li>
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.8.19
Django==1.11.11
six==1.10.0
amqp==2.2.2
anyjson==0.3.3
Expand Down Expand Up @@ -45,7 +45,7 @@ django-forms-bootstrap==3.1.0
django-geoexplorer==4.0.39
django-geonode-client==1.0.0
django-guardian==1.4.9
django-haystack==2.7.0
django-haystack==2.8.0
django-import-export==1.0.0
django-js-asset==1.0.0
django-invitations==1.9.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Pillow<=3.3.1", # python-imaging (3.1.2) - python-pillow (3.3.1 in our ppa)
"lxml<=3.8.0", # python-lxml (3.6.2 in our ppa) FIXME
"psycopg2<=2.7.3.1", # python-psycopg2 (2.7.3.1 in our ppa)
"Django==1.8.19", # python-django (1.8.19 in our ppa) FIXME
"Django==1.11.11", # python-django (1.8.19 in our ppa) FIXME

# Other
"amqp==2.2.2", # (python-amqp 2.2.2 in our ppa)
Expand Down

0 comments on commit 5972d18

Please sign in to comment.