Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22742 from edx/wiki-ver

Browse Source 
BOM-1126
This commit is contained in:
Awais Qureshi
2020-01-13 19:01:22 +05:00
committed by GitHub
parent c99a026ad3 4eb1a98f21
commit 3eb4154c6b
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/urls.py
View File

@@ -180,15 +180,15 @@ if settings.WIKI_ENABLED:
from course_wiki import views as course_wiki_views
from django_notify.urls import get_pattern as notify_pattern
wiki_url_patterns, wiki_app_name, wiki_namespace = wiki_pattern()
notify_url_patterns, notify_app_name, notify_namespace = notify_pattern()
wiki_url_patterns, wiki_app_name = wiki_pattern()
notify_url_patterns, notify_app_name = notify_pattern()
urlpatterns += [
# First we include views from course_wiki that we use to override the default views.
# They come first in the urlpatterns so they get resolved first
url('^wiki/create-root/$', course_wiki_views.root_create, name='root_create'),
url(r'^wiki/', include((wiki_url_patterns, wiki_app_name), namespace=wiki_namespace)),
url(r'^notify/', include((notify_url_patterns, notify_app_name), namespace=notify_namespace)),
url(r'^wiki/', include((wiki_url_patterns, wiki_app_name), namespace='wiki')),
url(r'^notify/', include((notify_url_patterns, notify_app_name), namespace='notify')),
# These urls are for viewing the wiki in the context of a course. They should
# never be returned by a reverse() so they come after the other url patterns

2
requirements/edx/base.txt
View File

@@ -7,7 +7,7 @@
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
-e common/lib/capa
-e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
-e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki
-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki
-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
-e .

2
requirements/edx/development.txt
View File

@@ -7,7 +7,7 @@
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
-e common/lib/capa
-e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
-e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki
-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki
-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
-e .

2
requirements/edx/github.in
View File

@@ -56,7 +56,7 @@ git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce8
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
# Third-party:
-e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki
-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki
git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme

2
requirements/edx/testing.txt
View File

@@ -7,7 +7,7 @@
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
-e common/lib/capa
-e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
-e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki
-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki
-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
-e .