Merge pull request #15690 from edx/christina/django-wiki-upgrade

Django-wiki upgrades.

lms/templates/wiki/plugins/attachments/index.html

@@ -87,7 +87,7 @@
               <td class="attachment-actions">
                 {% if attachment|can_write:user %}
                   {% if not attachment.current_revision.deleted %}
-                    {% if attachment.article = article %}
+                {% if 'attachment.article = article' %}
                       <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-danger">{% trans "Delete" %}</a>
                     {% else %}
                       <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Detach" %}</a>

requirements/edx/base.txt

@@ -23,12 +23,12 @@ django-extensions==1.5.9
 django-filter==1.0.4
 django-ipware==1.1.0
 django-model-utils==2.3.1
-django-mptt==0.7.4
+django-mptt>=0.8.6,<0.9
 django-oauth-plus==2.2.8
 django-oauth-toolkit==0.12.0
 django-pipeline-forgiving==1.0.0
 django-pyfs==1.0.6
-django-sekizai==0.8.2
+django-sekizai>=0.10
 django-ses==0.7.1
 django-simple-history==1.6.3
 django-statici18n==1.4.0
@@ -68,7 +68,7 @@ help-tokens==1.0.3
 httpretty==0.8.3
 lazy==1.1
 mako==1.0.2
-Markdown==2.2.1
+Markdown>=2.6,<2.7
 --allow-external meliae
 --allow-unverified meliae
 meliae==0.4.0
@@ -104,7 +104,7 @@ scipy==0.14.0
 Shapely==1.2.16
 singledispatch==3.4.0.2
 six>=1.10.0,<2.0.0
-sorl-thumbnail==12.3
+sorl-thumbnail>=12.3,<13
 sortedcontainers==0.9.2
 stevedore==1.10.0
 sure==1.2.3

requirements/edx/github.txt

@@ -47,7 +47,7 @@
 
 # Third-party:
 git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline==1.5.3
-git+https://github.com/edx/django-wiki.git@v0.0.10#egg=django-wiki==0.0.10
+git+https://github.com/edx/django-wiki.git@v0.0.11#egg=django-wiki==0.0.11
 git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8
 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
 git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6