Commit 399bcc28 by Greg Price

Merge pull request #8365 from edx/hotfix/2015-06-04

Enable VAL URLs even when mobile API is disabled
parents b58f0b4d 59f72b55
...@@ -92,6 +92,10 @@ urlpatterns = ( ...@@ -92,6 +92,10 @@ urlpatterns = (
# Profile Images API endpoints # Profile Images API endpoints
url(r'^api/profile_images/', include('openedx.core.djangoapps.profile_images.urls')), url(r'^api/profile_images/', include('openedx.core.djangoapps.profile_images.urls')),
# Video Abstraction Layer used to allow video teams to manage video assets
# independently of courseware. https://github.com/edx/edx-val
url(r'^api/val/v0/', include('edxval.urls')),
) )
if settings.FEATURES["ENABLE_COMBINED_LOGIN_REGISTRATION"]: if settings.FEATURES["ENABLE_COMBINED_LOGIN_REGISTRATION"]:
...@@ -115,9 +119,6 @@ else: ...@@ -115,9 +119,6 @@ else:
if settings.FEATURES["ENABLE_MOBILE_REST_API"]: if settings.FEATURES["ENABLE_MOBILE_REST_API"]:
urlpatterns += ( urlpatterns += (
url(r'^api/mobile/v0.5/', include('mobile_api.urls')), url(r'^api/mobile/v0.5/', include('mobile_api.urls')),
# Video Abstraction Layer used to allow video teams to manage video assets
# independently of courseware. https://github.com/edx/edx-val
url(r'^api/val/v0/', include('edxval.urls')),
) )
# if settings.FEATURES.get("MULTIPLE_ENROLLMENT_ROLES"): # if settings.FEATURES.get("MULTIPLE_ENROLLMENT_ROLES"):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment