Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,477 Commits 1 Branch 0 Tags
dd806387368761f0ee069a50cc2bba7d4953274e
Commit Graph

57 Commits

Author SHA1 Message Date
Jillian Vogel
b43ac4e80e Merge pull request #16590 from open-craft/jill/video-block-all-sources 
Adds all HTML5 sources to the returned video API data
 2017-12-12 02:19:02 +10:30
Jillian Vogel
cdcb4be077 Adds "all_sources" field to Mobile API and video module Course Blocks 
student_view_data.

Added to both places because the iOS app uses both APIs data to provide
downloadable videos.
 2017-12-11 23:59:52 +10:30
John Eskew
b14d2e9cf7 Fix video transcript model import before Django initialization occurs. 2017-12-07 09:56:44 -05:00
bmedx
bebdc069a7 LMS urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
- This is the third urls update for LMS
 2017-11-07 14:17:54 -05:00
Qubad786
9c06bb65b1 Use edx-val transcripts and translations collectively with contentstore. 
Adds val trancripts in outcome of get_transcripts_info and rest of flow remains the same and also add fallback  to edx-val rtanscripts for mobile accessible video endpoints.
 2017-10-16 19:23:18 +05:00
Omar Al-Ithawi
302e1d923e Allow displaying videos without transcripts 2017-09-11 21:29:58 +03:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00
John Eskew
76389d8678 Run all files touched in inheritance/partition work through isort. 2017-05-25 13:24:08 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
christopher lee
b5e987ba61 MA-3091: Added mobile_available flag override admin setting 2017-01-23 15:04:40 -05:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Nimisha Asthagiri
a1a5a0fcb9 Enable Milestones in LMS Tests 2016-07-27 14:56:24 -04:00
wajeeha-khalid
86e954f642 version-based mobile app upgrade 2016-04-14 15:43:34 +05:00
Ben Patterson
c504029b39 Create a third shard for lms unit tests. 
This will leverage the nose attrib plugin to allow us
to break tests apart on our build system to run
in parallel on separate nodes.
 2016-03-17 12:01:42 -04:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -05:00
Eric Fischer
88a389652b CohortMembership Test Fixes 
There are 3 main changes in this commit:
* CohortFactory now sets up memberships properly, so consuming tests do not
need to explicitly touch CourseUserGroup.users to add() users.
* test_get_cohort_sql_queries has been updated to 3 and 9 queries when using
and not using the cache, respectively. This is needed due to each operation
needing an extra queery to get the CourseUserGroup from the CohortMembership.
* Adding remove_user_from_cohort(), the counterpart to add_user_to_cohort().
This is also to keep tests from touching the users field directly, and keep
CohortMembership data in sync.
 2015-12-02 15:03:52 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
Carlos de la Guardia
d56303dd0f Only enable the OverrideFieldData when there are active overrides on a course. 2015-06-17 15:26:10 -04:00
Nimisha Asthagiri
4921ec48c8 MA-792 Course Blocks and Navigation API (user-specific) 2015-06-12 09:27:20 -04:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
Alexander Kryklia
4c7bfb44dd Add Video Bumper. 
Fix n-click behaviour on poster.
Fix unit tests.
Fix handler for non_en lang for bumper.
Add more tests.
Fix docstrings.
Fix pep8.
Fix static redirection with bumper.
Fix button in IE11.
Add video_bumper field in bok_choy.

Fix pylink violations.

Update docstrings and some clean up.

Rename edx_video_id in bumper tests.

Fix too long lines in help text.

Address ui comments.

Fix bumper events.

Refactor bumper-transcripts code, fix bugs, address comments.
Squashed commits:
Fix download transcript button.
[74e0c8c] Fix quality
[a759f33] Fix error, when sub contains extension.
[b30755c] Revert "Add video files to host for transcripts."

This reverts commit cf8a96bf84346e17b6ad57ad4cc6a27d7a9118cd.
[36f038a] Add video files to host for transcripts.
[23f1655] Fix pep8 and pyling issues.
[0f1f9d2] Update acceptance test.
[765a27d] Wait for ajax in captions.
[8ae72a3] Fix logic.
[063450f] Fix unit tests.
[d1075fc] Fix handlers tests.
[25d31ad] Update bumper_utils.
[cb5f9df] Remove maxDiff.
[8738b1a] Code cleanup.
[87dbcb7] Fix issues with transcripts.
[ec899de] Fix transcripts in serializers.
[444b1fc] Fix transcripts typo.
[d524cb5] Fix bumper.
[f62cf22] Fix video mongo tests.
[8f1b55a] Fix dispatches.
[53bc308] Add more fixes.
[d5e3723] Fix test_video_handlers and rename the method.
[93efc23] Fix mobile tests.
[740e2ae] Fix pep8 and pylint.
[47cfb66] Address comments, add fixes.
[4e499d9] Add fixes.
[8353553] Add improvements.

Updated dispatch values)
.

Use ddt in bumper handler tests.

Move common metadata to single place.

Fix style.

Update docstring.

Fix poster button.

Improve bumper events.

Fix test after rebase.

Address comments.

Download transcript: use def video lang, not bump.

Renamed date_last_view_bumper to bumper_last_view_date.

Rename do_not_show_again_bumper to bumper_...

Address comments.

Fix tests for download for en lang.

Fix bumper logic.

Update strings.

Update resizer.

Remove resizer.

Fix unit tests.

Add tests.

Fix bumper events.

Clean up tests.

Fix pylint violations.

Fix pep8 and pylint violations.

Update docs and method names.

Update events.

Make /static/ prefix a must.

Fix wrong code.
 2015-05-31 14:45:31 +03:00
Nimisha Asthagiri
83866943bb Merge pull request #8212 from edx/mobile/API_decorators 
Move generic mobile API view decorators.
 2015-05-27 15:36:48 -04:00
Nimisha Asthagiri
a7fabd5927 Move generic mobile API view decorators. 2015-05-27 14:35:27 -04:00
Nimisha Asthagiri
5aa15954f7 Minor update to video_outline API. 2015-05-27 12:00:18 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import 
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
 2015-03-31 19:35:06 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course 
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
 2015-03-26 12:36:43 -04:00
christopher lee
3b150da1d7 MA-169 return requested val encoded video profiles 
MA-169 Mobile api now calls for mobile_low (default), mobile_high,
 and youtube profiles instead of only mobile_low.
 2015-03-25 15:40:58 -04:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only 
Add web-only setting to video module
 2015-03-23 15:38:18 -04:00
Greg Price
438ce5f7a4 Add web-only setting to video module 
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
 2015-03-23 14:45:17 -04:00
Nimisha Asthagiri
d7386ecc87 Use depth=0 for call to cache_for_descriptor_descendents. 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
eca523e01e Mobile API MA-7: Support A/B test and cohorted content 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
091d6aebe9 Mobile API: Modularize VideoOutline code 2015-03-18 14:55:15 -04:00
Syed Hassan Raza
7b194a3324 Unicode handling for transcript filename 
TNL-1253 https://openedx.atlassian.net/browse/TNL-1253
 2015-03-02 16:39:49 +05:00
Nimisha Asthagiri
a6130507c1 Mobile Video Summary API: add filter for get_children 2015-02-10 14:02:50 -05:00
christopher lee
b6c08ad213 Named_path variable now populates complete path 2015-01-20 12:53:37 -05:00
Nimisha Asthagiri
e57f3e3b03 Merge pull request #6572 from edx/mobile/fix-decorator-api 
Fix Mobile API decorators
 2015-01-13 06:20:10 -05:00
Nimisha Asthagiri
9566a46a4d Fix Mobile API decorators. 2015-01-13 02:29:53 -05:00
christopher lee
3e5f7bacdd MA-187 ValueError fix 
Fix for MA-187 where a value error was thrown when
a course has a video directly under a section. This
PR handles the situations where a chapter or section
can be none, and then returns the appropriate url
if available.
 2015-01-12 14:15:18 -05:00
Nimisha Asthagiri
5349b55bd0 MA-199 Course Authorization framework in mobile API. 2015-01-07 19:31:02 -05:00
Nimisha Asthagiri
0687a62a8f Add back end for Studio video upload feature 
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
 2014-12-15 13:09:59 -05:00
Nimisha Asthagiri
aa309a8caf MA-182 Fix Mobile Subtitles. 2014-12-11 08:54:03 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases 
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
 2014-12-02 07:09:36 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Akiva Leffert
f4dc90b348 Add an endpoint for syncing a user's course status metadata 
JIRA: MA-75
 2014-11-24 17:55:51 -05:00