Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for vimeo videos with course-searchable captions #357

Merged
merged 1 commit into from
May 4, 2020
Merged

Add support for vimeo videos with course-searchable captions #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cms/envs/devstack_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)

FEATURES.update({
'ENABLE_COURSEWARE_INDEX': False,
'ENABLE_LIBRARY_INDEX': False,
'ENABLE_COURSEWARE_INDEX': True,
'ENABLE_LIBRARY_INDEX': True,
'ENABLE_DISCUSSION_SERVICE': True,
})

Expand Down
6 changes: 3 additions & 3 deletions lms/envs/devstack_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

FEATURES.update({
'AUTOMATIC_AUTH_FOR_TESTING': True,
'ENABLE_COURSEWARE_SEARCH': False,
'ENABLE_COURSE_DISCOVERY': False,
'ENABLE_DASHBOARD_SEARCH': False,
'ENABLE_COURSEWARE_SEARCH': True,
'ENABLE_COURSE_DISCOVERY': True,
'ENABLE_DASHBOARD_SEARCH': True,
'ENABLE_DISCUSSION_SERVICE': True,
'SHOW_HEADER_LANGUAGE_SELECTOR': True,
'ENABLE_ENTERPRISE_INTEGRATION': False,
Expand Down
2 changes: 2 additions & 0 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc8685
git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3
git+https://github.com/edx/xblock-lti-consumer.git@v1.2.5#egg=lti_consumer-xblock==1.2.5
git+https://github.com/appsembler/tahoe-lti.git@release-0.2.0#egg=tahoe-lti==release-0.2.0
-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption
-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock
git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
-e .
git+https://github.com/edx/edx-ora2.git@2.2.0#egg=ora2==2.2.0
Expand Down
2 changes: 2 additions & 0 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f
git+https://github.com/edx/lettuce.git@7a04591c78ac56dac3eb3e91ca94b15cce844133#egg=lettuce==0.2.23+edx.1
git+https://github.com/edx/xblock-lti-consumer.git@v1.2.5#egg=lti_consumer-xblock==1.2.5
git+https://github.com/appsembler/tahoe-lti.git@release-0.2.0#egg=tahoe-lti==release-0.2.0
-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption
-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock
git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
-e .
git+https://github.com/edx/edx-ora2.git@2.2.0#egg=ora2==2.2.0
Expand Down
3 changes: 3 additions & 0 deletions requirements/edx/github.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,6 @@
-e git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3
-e git+https://github.com/open-craft/xblock-poll@add89e14558c30f3c8dc7431e5cd6536fff6d941#egg=xblock-poll==1.5.1
-e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.1.6#egg=xblock-drag-and-drop-v2==2.1.6
# Forks of pycaption and xblock-video with updated dependencies
-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption
-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock
2 changes: 2 additions & 0 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f
git+https://github.com/edx/lettuce.git@7a04591c78ac56dac3eb3e91ca94b15cce844133#egg=lettuce==0.2.23+edx.1
git+https://github.com/edx/xblock-lti-consumer.git@v1.2.5#egg=lti_consumer-xblock==1.2.5
git+https://github.com/appsembler/tahoe-lti.git@release-0.2.0#egg=tahoe-lti==release-0.2.0
-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption
-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock
git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
-e .
git+https://github.com/edx/edx-ora2.git@2.2.0#egg=ora2==2.2.0
Expand Down