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

66 Commits

Author SHA1 Message Date
Peter Fogg
ae006cffc4 Skip extra-flaky video test. 2015-09-04 09:53:47 -04:00
Calen Pennington
05e33677f7 Merge pull request #9615 from edx/release-2015-09-02-merge-to-master 
Release 2015 09 02 merge to master
 2015-09-04 09:43:38 -04:00
Ben Patterson
dff9f745e4 Reference appropriate JIRA ticket as a TODO. 2015-09-03 17:19:53 -04:00
Peter Fogg
447e0cf838 Mark test_video_control_events as flaky. 2015-09-03 16:12:38 -04:00
Adam Palay
f099a7e911 fix issue where video player renders twice (TNL-3064) 2015-09-01 15:11:31 -04:00
Syed Hassan Raza
a2bca09c86 fetch transcript for html5 with youtubeId if 404 2015-08-27 08:04:57 -07:00
Usman Khalid
0dbb969be3 Fixed video bumper tests. 
TNL-2883
 2015-08-26 14:50:56 +05:00
Usman Khalid
e3bd509a39 Re-enable skipped video player tests. 
This reverts commit f58764875c.
 2015-08-21 02:55:04 +05:00
Ben Patterson
92c9c1d529 New bok-choy shard (#7). 2015-08-05 13:52:39 -04:00
muzaffaryousaf
45bb1abd59 Skipping the failing tests; which are also failing in master 
Can see if we remove skipIf from video base class.

TNL-2413
 2015-07-24 18:20:01 +05:00
Christine Lytwynec
e31a78cbb7 move bok choy video license tests to shard_2 2015-06-08 15:51:13 -04:00
Syed Hassan Raza
dc13bbe1d6 Remove table of contents 2015-06-02 18:40:00 +05: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
Sarina Canelake
ca64c665cc Default course license to All Rights Reserved 
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
 2015-05-18 14:37:32 -04:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED 
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
 2015-05-18 14:36:04 -04:00
David Baumgold
ca2fee1259 Move LicenseMixin into VideoFields class 2015-05-18 14:35:07 -04:00
Adam Palay
8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master 
Conflicts:
	common/test/acceptance/tests/video/test_video_times.py
 2015-05-08 10:23:04 -04:00
Adam Palay
2842029a7f skip failing test 2015-05-07 14:34:44 -04:00
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track 
Make user_track use eventtracking
 2015-05-07 08:43:21 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Ben Patterson
eacf25673a Mark test as flaky. TNL-1619 2015-05-05 19:37:55 -04:00
Ben Patterson
5f0cd587fd Add bok-choy shards 4 and 5. When no shard is specified on a test, it 
will fall in 'shard 6'
 2015-04-30 17:34:24 -04:00
Muhammad Ammar
7babb3efed Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-traditional-chinese-transcript-language-options 
Add Simplified and Traditional Chinese as Transcript language options
 2015-04-21 18:28:17 +05:00
muhammad-ammar
cec4bb3101 Add Simplified and Traditional Chinese as Transcript language options 
TNL-1740
 2015-04-15 15:38:42 +05:00
ataki
5917ed063d hard start/stop times to video player 
This pull request makes the video player module respect
the video start/stop times specified by the instructor
as a hard start/stops, i.e. the video treats the start
time as the beginning of the video and the stop time as
the end.

Previously, the video module displayed the full
video and displayed a jquery ui slider range representing
the start and end times.

This new functionality invalidates two previous acceptance
tests for the video module:

    - slider visible test
    - finish time video acceptance test.

These tests are removed from the common acceptance tests.
 2015-04-14 15:56:56 -04:00
marjev
29bceffcea Fixed flaky test(s) - (SOL-336) 2015-03-27 14:48:36 +01:00
cahrens
3e7488f52c Add flaky decorator. 
Related to TNL-1642.
 2015-03-06 13:04:42 -05:00
cahrens
758d2f4e3b Add flaky decorator. 
Related to TNL-1619.
 2015-03-06 13:04:42 -05:00
David Baumgold
a849657358 Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky 2015-03-04 16:25:31 -05:00
polesye
4b551b5357 TNL-454: Fix flaky bok-choy tests. 2015-02-19 14:43:34 +02:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-28 12:26:16 +05:00
Usman Khalid
b4caf38815 Disabled failing test test_video_end_time_with_default_start_time. 2014-10-01 19:16:08 +05:00
Christine Lytwynec
2887121390 disabling test_video_start_time_and_end_time 2014-09-23 09:15:58 -04:00
zubair-arbi
b2b46332f8 wait for notification on adding video component 
TNL-392
 2014-09-16 17:20:31 +05:00
Jesse Zoldak
a1eb44d9c6 skip intermittently failing test TNL-392 2014-09-15 12:13:06 -04:00
zubair-arbi
e3f499a757 show video controls for all youtube videos 
TNL-184
 2014-09-11 17:02:27 +05:00
muhammad-ammar
94c90556c2 Split Bok-Choy Tests into 3 shards 
TE-447
 2014-09-02 08:36:33 -04:00
Muhammad Ammar
6b2874de2b Bok-Choy Video Transcript tests Batch3 2014-08-28 09:10:13 +00:00
Muhammad Ammar
75a0d52472 Bok-Choy Video Transcript Tests Batch 2 2014-08-22 07:28:48 +00:00
muhammad-ammar
06842be865 Merge pull request #4859 from edx/ammar/bok-choy-video-transcript-tests 
Bok-Choy Video Transcript Tests Batch1
 2014-08-21 12:01:04 +05:00
Ben Patterson
ea967148ed Merge pull request #4860 from edx/benp/lint-cleanup 
pep8 improvements on bok-choy tests.
 2014-08-20 10:08:38 -04:00
Ben Patterson
a18660cabd pep8 improvements on bok-choy tests. 2014-08-20 09:05:30 -04:00
Muhammad Ammar
cfeb7102a6 Bok-Choy Video Transcript Tests 2014-08-20 12:11:21 +00:00
Muhammad Ammar
f93e4f2775 Bok-Choy CMS Video Editor Tests 2014-08-18 15:44:30 +00:00
Muhammad Ammar
936bd4d5ad Bok-Choy CMS Video Tests 2014-08-11 07:50:19 +00:00
clytwynec
8c8d388d1a Merge pull request #4744 from edx/clytwynec/remove_flaky_decorator_from_tests 
removing "flaky" plugin, since it is not reporting failures properly
 2014-08-08 10:15:03 -04:00
Christine Lytwynec
0243d0afa1 removing "flaky" plugin, since it is not reporting failures properly 2014-08-07 16:48:31 -04:00
cahrens
7cb5c4d7b8 Updates based on merge with master. 2014-08-07 12:16:18 -04:00
Muhammad Ammar
9bdf16d832 Fix property call issue 2014-08-07 09:35:08 +00:00