From cfe553304cb01d55e06e4b9f7de85428b4f61487 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 12:00:05 -0400 Subject: [PATCH 01/17] Removed link to wiki settings until we have a better integration with notifications. --- lms/templates/wiki/includes/article_menu.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lms/templates/wiki/includes/article_menu.html b/lms/templates/wiki/includes/article_menu.html index 5088ae9570..9faab31831 100644 --- a/lms/templates/wiki/includes/article_menu.html +++ b/lms/templates/wiki/includes/article_menu.html @@ -35,6 +35,10 @@ %endif %endfor + +<%doc> +The settings link has been disabled because the notifications app hasn't been integrated yet and those are the only useful settings. + %if not user.is_anonymous():
  • @@ -43,4 +47,6 @@
    • %endif + + From f68a97a63fe314770d00158bc5b3a3f419bea20c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 21 Aug 2012 13:54:58 -0400 Subject: [PATCH 02/17] Added changes to wiki 404 and fixed CMS Sass --- cms/static/sass/_base.scss | 5 ++++ lms/static/sass/course/wiki/_wiki.scss | 33 ++++++++++++++++++++++++++ lms/templates/wiki/wiki-404.html | 5 ++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 7d16f0c6f9..8d14bcff6b 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -14,6 +14,11 @@ $yellow: #fff8af; $cream: #F6EFD4; $border-color: #ddd; +// edX colors +$blue: rgb(29,157,217); +$pink: rgb(182,37,104); + + @mixin hide-text { background-color: transparent; border: 0; diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index 43769c93a6..a666607efb 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -767,6 +767,39 @@ section.wiki { text-decoration: none; } } + + .missing { + max-width: 400px; + margin: lh(2) auto; + display: block; + overflow: hidden; + background: $pink; + padding: lh(); + @include box-shadow(inset 0 0 0 1px lighten($pink, 10%)); + border: 1px solid darken($pink, 15%); + + p { + color: #fff; + + a { + display: block; + background: darken($pink, 8%); + margin: lh() (-(lh())) (-(lh())); + padding: lh(); + border-top: 1px solid darken($pink, 15%); + color: #fff; + font-weight: bold; + font-size: em(18); + @include transition; + text-align: center; + -webkit-font-smoothing: antialiased; + + &:hover { + background: darken($pink, 12%); + } + } + } + } } .modal-backdrop { diff --git a/lms/templates/wiki/wiki-404.html b/lms/templates/wiki/wiki-404.html index a18ea3786a..f44937c2e6 100644 --- a/lms/templates/wiki/wiki-404.html +++ b/lms/templates/wiki/wiki-404.html @@ -10,9 +10,8 @@ {% block wiki_contents %} -
    -

    This article was not found, and neither was the parent. Go back to the main wiki article.

    - +
    +

    This article was not found, and neither was its parent article. Go back to the main wiki article

    {% endblock %} From 6ce69e28aefa6386b11109bf2ee28388e2052dee Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 15:58:35 -0400 Subject: [PATCH 03/17] Moved the wiki 404 page into the django-wiki project. --- lms/templates/wiki/wiki-404.html | 17 ----------------- repo-requirements.txt | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 lms/templates/wiki/wiki-404.html diff --git a/lms/templates/wiki/wiki-404.html b/lms/templates/wiki/wiki-404.html deleted file mode 100644 index f44937c2e6..0000000000 --- a/lms/templates/wiki/wiki-404.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "wiki/base.html" %} -{% load wiki_tags i18n %} -{% load url from future %} - -{% block pagetitle %}{{ article.current_revision.title }}{% endblock %} - -{% block wiki_breadcrumbs %} -{% include "wiki/includes/breadcrumbs.html" %} -{% endblock %} - -{% block wiki_contents %} - -
    -

    This article was not found, and neither was its parent article. Go back to the main wiki article

    -
    - -{% endblock %} diff --git a/repo-requirements.txt b/repo-requirements.txt index 5b50034039..1f7b1b6470 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,5 +1,5 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@e237b2ac#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@876357a#egg=django-wiki -e common/lib/capa -e common/lib/xmodule From 954ee6ab1f46d1c8ac10c113fad4a859fe41ac98 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 17:09:24 -0400 Subject: [PATCH 04/17] Added link to list children of an article. Upgraded django-wiki version. --- lms/templates/wiki/article.html | 6 +++++- repo-requirements.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html index 7175219f74..57b97edc6b 100644 --- a/lms/templates/wiki/article.html +++ b/lms/templates/wiki/article.html @@ -14,7 +14,11 @@
    {% if selected_tab != "edit" %} -

    {{ article.current_revision.title }}

    +

    {{ article.current_revision.title }}

    + + {% if urlpath %} + Show all children + {% endif %} {% endif %} {% block wiki_contents_tab %} diff --git a/repo-requirements.txt b/repo-requirements.txt index 1f7b1b6470..8fc80ab9b3 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,5 +1,5 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@876357a#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@221fca1#egg=django-wiki -e common/lib/capa -e common/lib/xmodule From 41831654ee767c925b1d49f9a35c3845426009db Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 17:44:38 -0400 Subject: [PATCH 05/17] Added link to see wiki attachment history. --- lms/templates/wiki/plugins/attachments/index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lms/templates/wiki/plugins/attachments/index.html b/lms/templates/wiki/plugins/attachments/index.html index d448392933..464a63e5fe 100644 --- a/lms/templates/wiki/plugins/attachments/index.html +++ b/lms/templates/wiki/plugins/attachments/index.html @@ -115,7 +115,13 @@ {% if attachment.current_revision.user %}{{ attachment.current_revision.user }}{% else %}{% if user|is_moderator %}{{ attachment.current_revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %} {{ attachment.current_revision.get_size|filesizeformat }} - {{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %} + + + + + {% trans "File history" %} ({{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %}) + +
    From 82d414690be471180898fb5d038e8dcc326b4060 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 22:23:40 -0400 Subject: [PATCH 06/17] Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled. --- lms/templates/wiki/article.html | 3 ++ lms/templates/wiki/delete.html | 62 --------------------------------- repo-requirements.txt | 2 +- 3 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 lms/templates/wiki/delete.html diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html index 57b97edc6b..b524eb8d06 100644 --- a/lms/templates/wiki/article.html +++ b/lms/templates/wiki/article.html @@ -16,9 +16,12 @@ {% if selected_tab != "edit" %}

    {{ article.current_revision.title }}

    + {% comment %} + This has been disabled until we can style it. {% if urlpath %} Show all children {% endif %} + {% endcomment %} {% endif %} {% block wiki_contents_tab %} diff --git a/lms/templates/wiki/delete.html b/lms/templates/wiki/delete.html deleted file mode 100644 index acabb79aad..0000000000 --- a/lms/templates/wiki/delete.html +++ /dev/null @@ -1,62 +0,0 @@ -{% extends "wiki/base.html" %} -{% load wiki_tags i18n sekizai_tags %} -{% load url from future %} - -{% block pagetitle %}{% trans "Delete article" %}{% endblock %} - -{% block wiki_contents %} -

    {% trans "Delete" %} "{{ article.current_revision.title }}"

    - - {% if cannot_delete_root %} -

    {% trans "You cannot delete a root article." %}

    -

    {% trans "Go back" %}

    - {% else %} - - {% if cannot_delete_children %} - -

    {% trans "You cannot delete this article because you do not have permission to delete articles with children. Try to remove the children manually one-by-one." %}

    - - {% endif %} - - {% if delete_children %} - -

    {% trans "You are deleting an article. This means that its children will be deleted as well. If you choose to purge, children will also be purged!" %}

    - -

    {% trans "Articles that will be deleted" %}

    - -
      - {% for child in delete_children %} -
    • {{ child.article }}
      • - {% if delete_children_more %} -
    • {% trans "...and more!" %}
      • - {% endif %} - {% endfor %} -
    - - {% endif %} - - {% if not cannot_delete_children %} -

    {% trans "You are deleting an article. Please confirm." %}

    - -
    - {% wiki_form delete_form %} - -
    - - - {% trans "Go back" %} - - -
    -
    - {% endif %} - - {% endif %} - -{% endblock %} - diff --git a/repo-requirements.txt b/repo-requirements.txt index 8fc80ab9b3..5e385ec3e6 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,5 +1,5 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@221fca1#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@32416cd1e#egg=django-wiki -e common/lib/capa -e common/lib/xmodule From 9e81ea3981553463ea193baf1906e0fbb5347f09 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 22:31:13 -0400 Subject: [PATCH 07/17] Added instructor tabs to wiki course nav. --- lms/djangoapps/course_wiki/course_nav.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/djangoapps/course_wiki/course_nav.py b/lms/djangoapps/course_wiki/course_nav.py index 1d124972c7..122f9ebb54 100644 --- a/lms/djangoapps/course_wiki/course_nav.py +++ b/lms/djangoapps/course_wiki/course_nav.py @@ -5,6 +5,7 @@ from django.http import Http404 from django.shortcuts import redirect from wiki.models import reverse as wiki_reverse +from courseware.access import has_access from courseware.courses import get_course_with_access @@ -135,7 +136,9 @@ def context_processor(request): try: course = get_course_with_access(request.user, course_id, 'load') - return {'course' : course} + staff_access = has_access(request.user, course, 'staff') + return {'course' : course, + 'staff_access': staff_access} except Http404: # We couldn't access the course for whatever reason. It is too late to change # the URL here, so we just leave the course context. The middleware shouldn't From c77d71870330e61cfd9570f4c1b5debbca06ce34 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 22:58:07 -0400 Subject: [PATCH 08/17] Updated django-wiki with delete article bug. --- repo-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo-requirements.txt b/repo-requirements.txt index baf63161a4..832bbce73d 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,6 +1,6 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@32416cd1e#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@c43257488e#egg=django-wiki -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e common/lib/capa -e common/lib/xmodule From 9162bdb1b9809c8eaeb9619160386d4dba8a1cf4 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 23:06:45 -0400 Subject: [PATCH 09/17] Changed wiki setting so article owners can't change permissions. --- lms/envs/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/envs/common.py b/lms/envs/common.py index a217f0e7b9..c99423c7a1 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -318,6 +318,7 @@ WIKI_ACCOUNT_HANDLING = False WIKI_EDITOR = 'course_wiki.editors.CodeMirror' WIKI_SHOW_MAX_CHILDREN = 0 # We don't use the little menu that shows children of an article in the breadcrumb WIKI_ANONYMOUS = False # Don't allow anonymous access until the styling is figured out +WIKI_CAN_CHANGE_PERMISSIONS = lambda article, user: user.has_perm('wiki.assign') ################################# Jasmine ################################### JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee' From eb62b80fca1943fb294bebf487789ae2b8046695 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 21 Aug 2012 23:46:26 -0400 Subject: [PATCH 10/17] Updated django-wiki with another deletion bug fix. --- repo-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo-requirements.txt b/repo-requirements.txt index 832bbce73d..750ef66920 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,6 +1,6 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@c43257488e#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@a8dbb5f#egg=django-wiki -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e common/lib/capa -e common/lib/xmodule From a285d1a60e3fb587682f17ab4fe8844b4bf9fb3c Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 22 Aug 2012 00:07:37 -0400 Subject: [PATCH 11/17] Updated wiki preview template and django-wiki version. --- lms/templates/wiki/preview_inline.html | 17 +++++++++++++---- repo-requirements.txt | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lms/templates/wiki/preview_inline.html b/lms/templates/wiki/preview_inline.html index 9248454137..a5c6668d16 100644 --- a/lms/templates/wiki/preview_inline.html +++ b/lms/templates/wiki/preview_inline.html @@ -10,22 +10,31 @@
    {% if revision %}
    - {% trans "Previewing revision" %}: {{ revision.created }} (#{{ revision.revision_number }}) by {% if revision.user %}{{ revision.user }}{% else %}{% if user|is_moderator %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %} + {% trans "Previewing revision" %}: + {% include "wiki/includes/revision_info.html" %}
    {% endif %} {% if merge %}
    {% trans "Previewing merge between" %}: - {{ merge1.created }} (#{{ merge1.revision_number }}) by {% if merge1.user %}{{ merge1.user }}{% else %}{% if user|is_moderator %}{{ merge1.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %} + {% include "wiki/includes/revision_info.html" with revision=merge1 %} {% trans "and" %} - {{ merge1.created }} (#{{ merge1.revision_number }}) by {% if merge1.user %}{{ merge1.user }}{% else %}{% if user|is_moderator %}{{ merge1.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %} + {% include "wiki/includes/revision_info.html" with revision=merge2 %}
    {% endif %}

    {{ title }}

    - {% wiki_render article content %} + {% if revision and revision.deleted %} +
    + This revision has been deleted. +

    Restoring to this revision will mark the article as deleted.

    +
    + {% else %} + {% wiki_render article content %} + {% endif %} +
    diff --git a/repo-requirements.txt b/repo-requirements.txt index 750ef66920..eaba29c197 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,6 +1,6 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@a8dbb5f#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@9865b5c#egg=django-wiki -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e common/lib/capa -e common/lib/xmodule From 723519ee74dad270fe7453174072dd6a9d23af58 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 22 Aug 2012 00:55:03 -0400 Subject: [PATCH 12/17] Removed wiki/settings.html so the default one will be used. --- lms/templates/wiki/settings.html | 52 -------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 lms/templates/wiki/settings.html diff --git a/lms/templates/wiki/settings.html b/lms/templates/wiki/settings.html deleted file mode 100644 index a932a26498..0000000000 --- a/lms/templates/wiki/settings.html +++ /dev/null @@ -1,52 +0,0 @@ -{% extends "wiki/base.html" %} -{% load wiki_tags i18n %} -{% load url from future %} - -{% block pagetitle %}{% trans "Settings" %}: {{ article.current_revision.title }}{% endblock %} - -{% block wiki_breadcrumbs %} - {% include "wiki/includes/breadcrumbs.html" %} -{% endblock %} - -{% block wiki_contents %} - -
    -
    - {% if selected_tab != "edit" %} -

    {{ article.current_revision.title }}

    - {% endif %} - - {% for form in forms %} -
    -

    {{ form.settings_form_headline }}

    -
    - {% wiki_form form %} -
    -
    - -
    -
    - {% endfor %} -
    - - - - -
    -
    - {% trans "Last modified:" %}
    - {{ article.current_revision.modified }} -
    -
      - {% with "settings" as selected %} - {% include "wiki/includes/article_menu.html" %} - {% endwith %} -
    -
    -
    - -{% endblock %} - From 03248cc3241bf59787de3c95a08b113efab6a332 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 22 Aug 2012 10:09:06 -0400 Subject: [PATCH 13/17] Updated django-wiki. --- repo-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo-requirements.txt b/repo-requirements.txt index eaba29c197..787b504269 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,6 +1,6 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@9865b5c#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@6ccd08e#egg=django-wiki -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e common/lib/capa -e common/lib/xmodule From 96f0f7cbde9f8756722526d738660086d80a85b6 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 22 Aug 2012 11:36:06 -0400 Subject: [PATCH 14/17] Changed default contents of new course wiki. --- lms/djangoapps/course_wiki/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py index cfe802bbd7..aa0b286aa6 100644 --- a/lms/djangoapps/course_wiki/views.py +++ b/lms/djangoapps/course_wiki/views.py @@ -81,7 +81,7 @@ def course_wiki_redirect(request, course_id): root, course_slug, title=course.number, - content="{0}\n===\nThis is the wiki for **{1}**'s _{2}_.".format(course.number, course.org, course.title), + content="This is the wiki for **{0}**'s _{1}_.".format(course.org, course.title), user_message="Course page automatically created.", user=None, ip_address=None, From 390823bdea103e2a729b399c48519bd1783da6df Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 22 Aug 2012 11:37:01 -0400 Subject: [PATCH 15/17] Added django-wiki's requirements to requirements.txt, because they weren't being included automatically. --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5cafe64b8..72b13e63ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ django>=1.4,<1.5 pip numpy scipy -markdown +Markdown<2.3.0 pygments lxml boto @@ -43,5 +43,7 @@ django-ses django-storages django-threaded-multihost django-sekizai<0.7 +django-mptt>=0.5.3 +sorl-thumbnail networkx -r repo-requirements.txt From 3796bb4a124acb2fe74e9e0dcf1e043dabf449e7 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 22 Aug 2012 12:42:03 -0400 Subject: [PATCH 16/17] Changed title of default root wiki page to just be Wiki. --- lms/djangoapps/course_wiki/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py index aa0b286aa6..e754e1cdcd 100644 --- a/lms/djangoapps/course_wiki/views.py +++ b/lms/djangoapps/course_wiki/views.py @@ -114,7 +114,7 @@ def get_or_create_root(): "===", "Visit a course wiki to add an article.")) - root = URLPath.create_root(title="edX Wiki", + root = URLPath.create_root(title="Wiki", content=starting_content) article = root.article article.group = None From 7b4c86e55cd01880bb4c6446fdfad1d93d87b91c Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 22 Aug 2012 12:42:21 -0400 Subject: [PATCH 17/17] Updated django-wiki with bug fix. --- repo-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo-requirements.txt b/repo-requirements.txt index 787b504269..6e2572a732 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,6 +1,6 @@ -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/benjaoming/django-wiki.git@6ccd08e#egg=django-wiki +-e git://github.com/benjaoming/django-wiki.git@afdd97d#egg=django-wiki -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e common/lib/capa -e common/lib/xmodule