fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 055beb6)
django 1.10
authorJan Szejko <janek37@gmail.com>
Tue, 28 Mar 2017 11:52:59 +0000 (13:52 +0200)
committerJan Szejko <janek37@gmail.com>
Tue, 28 Mar 2017 11:52:59 +0000 (13:52 +0200)
apps/catalogue/templates/catalogue/base.html patch | blob | history
apps/fileupload/urls.py patch | blob | history
apps/forms_builder/forms/admin.py patch | blob | history
apps/wiki/templates/wiki/bootstrap.html patch | blob | history
redakcja/templates/registration/head_login.html patch | blob | history
requirements.txt patch | blob | history

diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html
index 41476e9..8e1c92e 100644 (file)
--- a/apps/catalogue/templates/catalogue/base.html
+++ b/apps/catalogue/templates/catalogue/base.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load catalogue %}
 {% load javascript stylesheet from pipeline %}
 {% load i18n %}
 {% load catalogue %}
 {% load javascript stylesheet from pipeline %}
-{% load static from staticfiles %}
+{% load static %}
 <!DOCTYPE html>
 <html>
 <head>
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/apps/fileupload/urls.py b/apps/fileupload/urls.py
index 68bdc48..1098ec6 100644 (file)
--- a/apps/fileupload/urls.py
+++ b/apps/fileupload/urls.py
@@ -3,10 +3,9 @@
 # This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from fileupload.views import UploadView
 
 from fileupload.views import UploadView
 
-urlpatterns = patterns(
-    '',
+urlpatterns = (
     url(r'^(?P<path>(?:.*/)?)$', UploadView.as_view(), name='fileupload'),
 )
     url(r'^(?P<path>(?:.*/)?)$', UploadView.as_view(), name='fileupload'),
 )
diff --git a/apps/forms_builder/forms/admin.py b/apps/forms_builder/forms/admin.py
index e1dd26d..bef87fe 100644 (file)
--- a/apps/forms_builder/forms/admin.py
+++ b/apps/forms_builder/forms/admin.py
@@ -7,7 +7,7 @@ from os.path import join
 from datetime import datetime
 from io import BytesIO, StringIO
 
 from datetime import datetime
 from io import BytesIO, StringIO
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.contrib import admin
 from django.core.files.storage import FileSystemStorage
 from django.core.urlresolvers import reverse
 from django.contrib import admin
 from django.core.files.storage import FileSystemStorage
 from django.core.urlresolvers import reverse
diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index 01f4989..4e4e947 100644 (file)
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -17,7 +17,7 @@
                 {% endif %}
             </script>
         {% endif %}
                 {% endif %}
             </script>
         {% endif %}
-        <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
+        <script src="{% url 'javascript_catalog' %}"></script>
         
         {% if DEBUG %}
             <link rel="stylesheet/less" type="text/css" href="{% static 'wiki/editor/src/editor/styles/main.less' %}"/>
         
         {% if DEBUG %}
             <link rel="stylesheet/less" type="text/css" href="{% static 'wiki/editor/src/editor/styles/main.less' %}"/>
diff --git a/redakcja/templates/registration/head_login.html b/redakcja/templates/registration/head_login.html
index a4591af..0c13ac8 100644 (file)
--- a/redakcja/templates/registration/head_login.html
+++ b/redakcja/templates/registration/head_login.html
@@ -4,10 +4,10 @@
 
 
 <li><a style="color: white">
 
 
 <li><a style="color: white">
-  <form action="{% url 'django.views.i18n.set_language' %}" method="post" style="display: inline">
+  <form action="{% url 'set_language' %}" method="post" style="display: inline">
   {% csrf_token %}
   <input type="hidden" name="language" value="en" /><button type="submit" style="border: 0; background: none">en</button></form> |
   {% csrf_token %}
   <input type="hidden" name="language" value="en" /><button type="submit" style="border: 0; background: none">en</button></form> |
-  <form action="{% url 'django.views.i18n.set_language' %}" method="post" style="display: inline">
+  <form action="{% url 'set_language' %}" method="post" style="display: inline">
   {% csrf_token %}
   <input type="hidden" name="language" value="pl" /><button type="submit" style="border: 0; background: none">pl</button></form> |
 </a>
   {% csrf_token %}
   <input type="hidden" name="language" value="pl" /><button type="submit" style="border: 0; background: none">pl</button></form> |
 </a>
diff --git a/requirements.txt b/requirements.txt
index b4f3305..d8d3bf5 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ httplib2 # oauth2 dependency
 # git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 ## Django
 # git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 ## Django
-Django>=1.9,<1.10
+Django>=1.10,<1.11
 fnpdjango>=0.2,<0.3
 django-pipeline>=1.6,<1.7
 sorl-thumbnail>=12.3,<13
 fnpdjango>=0.2,<0.3
 django-pipeline>=1.6,<1.7
 sorl-thumbnail>=12.3,<13