Commit Graph

19654 Commits

Author SHA1 Message Date
polesye
283777dac2 Merge pull request #1297 from edx/anton/fix-lti-export
LTI: Fix import/export.
2013-10-16 09:54:21 -07:00
David Baumgold
e363e5a72d Merge pull request #1337 from edx/db/fix-video-requirejs
fix video module issue with require.js
2013-10-16 09:40:48 -07:00
Brian Talbot
bbcb381092 LMS: adds in redundant, but needed dashboard visual padding rule 2013-10-16 12:29:49 -04:00
Brian Talbot
e0b73b05f2 LMS: removes error on <html> element syntax for iframed register buttons 2013-10-16 12:29:49 -04:00
Brian Talbot
e379a770b8 LMS: removes ie-fixes static:css group from all template references 2013-10-16 12:29:49 -04:00
Brian Talbot
56b2205e25 LMS: corrects indentation issue in hint_manager.html template 2013-10-16 12:29:49 -04:00
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04:00
brianhw
014089e62a Merge pull request #1364 from edx/ned/cherry-pick-pr-1297
Add EmptyDataRawDescriptor.
2013-10-16 09:09:19 -07:00
brianhw
7fca5e8b34 Merge pull request #1360 from edx/valera/carry_over_of_add_option_transcripts_remove_onhover_2
Valera/carry over of add option transcripts remove onhover 2
2013-10-16 09:03:29 -07:00
Frances Botsford
d949eb924d correcting some incorrect rules in verification sass 2013-10-16 11:57:20 -04:00
Diana Huang
5c8839931d Merge pull request #1363 from edx/diana/course-mode-expiration
Course Modes Expiration
2013-10-16 08:13:22 -07:00
polesye
de48e4a9d6 Add EmptyDataRawDescriptor. 2013-10-16 10:39:02 -04:00
Christina Roberts
637b66197b Merge pull request #1331 from edx/christina/index
Move index code into index.js.
2013-10-16 07:24:30 -07:00
jmclaus
4647b62ce2 Merge pull request #1314 from edx/jmclaus/bugfix_HD_control_state
Added two states to HD control: HD off - HD on
2013-10-16 07:23:08 -07:00
Diana Huang
3cfaa6de20 Add changelog 2013-10-16 10:15:50 -04:00
Diana Huang
8ec9a16d81 Fix parentheses so that we only pull the course modes we want. 2013-10-16 10:15:34 -04:00
Frances Botsford
1b430066f7 some layout tweaks to the verification choose your track page 2013-10-16 09:07:38 -04:00
Valera Rozuvan
4b371d4748 Fixing Jean Michel access. bug. 2013-10-16 15:45:13 +03:00
Valera Rozuvan
30ddaf7757 Enabling showing of captions always when mouse is over CC. 2013-10-16 15:45:08 +03:00
polesye
2e216a2c14 Clean up the code. 2013-10-16 15:45:04 +03:00
polesye
46abe397e2 Fix acceptance tests. 2013-10-16 15:44:59 +03:00
polesye
0bd706b6a1 Tidy up the code. 2013-10-16 15:44:55 +03:00
Valera Rozuvan
c3030e8f94 Fixing minor typo. 2013-10-16 15:44:50 +03:00
Valera Rozuvan
f17a84c965 Minor tweak. 2013-10-16 15:44:45 +03:00
Valera Rozuvan
3b7cc6a419 Furthe addressing comments on PR. 2013-10-16 15:44:40 +03:00
Valera Rozuvan
05eb13f086 Fixing JS.
There were previous merge conflicts in the file.
2013-10-16 15:44:35 +03:00
Valera Rozuvan
55fde6e5a7 Updated acceptance tests. 2013-10-16 15:44:30 +03:00
Valera Rozuvan
1f84053046 Updated acceptance tests. 2013-10-16 15:44:25 +03:00
Valera Rozuvan
e1e0cba033 Added acceptance tests. 2013-10-16 15:44:21 +03:00
Valera Rozuvan
2a6418ec04 Updated fixtures for Jasmine tests. 2013-10-16 15:44:11 +03:00
Valera Rozuvan
49f4a71178 Added functionality to show captions on "CC" button mousemove.
When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.

This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.
2013-10-16 15:44:05 +03:00
Valera Rozuvan
a1e0f7116a Added hard-coded flag to video.html that turns on/off autohiding of captions.
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
2013-10-16 15:43:58 +03:00
Valera Rozuvan
9f871e53c8 Updated code fomat in test Jasmine. 2013-10-16 15:43:50 +03:00
Valera Rozuvan
6713d6c7e3 Work in progress. 2013-10-16 15:43:42 +03:00
Will Daly
fd49f09284 Merge pull request #1358 from edx/will/fix-course-overview
Wait for non-blank link in course-overview test
2013-10-16 05:24:28 -07:00
jmclaus
49bd356766 Used chaining. Cached gettext call. 2013-10-16 14:09:03 +02:00
jmclaus
585751ffca Updated template and fixtures 2013-10-16 14:09:03 +02:00
jmclaus
3a798adb0f Added two states to HD control: HD off - HD on 2013-10-16 14:09:03 +02:00
Valera Rozuvan
d408d7adec Enabled 2nd disabled Jasmine test. 2013-10-16 15:02:59 +03:00
David Baumgold
deb36999ca Remove outdated comment 2013-10-16 07:56:00 -04:00
Valera Rozuvan
269089711e Enabled 2 disabled Jasmine tests. Fixed them. 2013-10-16 14:15:10 +03:00
Valera Rozuvan
cf3ea89289 Rebased. Updated Jasmine describe messages to make them more clearer. 2013-10-16 13:43:58 +03:00
David Baumgold
e930b96b52 Remove references to onYouTubePlayerAPIReady and onHTML5PlayerAPIReady 2013-10-16 13:28:28 +03:00
David Baumgold
bcf4fd5f3d Mock YT.ready in Xmodule JS tests
and disable tests that fail for unrelated reasons
2013-10-16 13:28:28 +03:00
David Baumgold
40e540284f wait to load video module until YT API is ready 2013-10-16 13:28:28 +03:00
Valera Rozuvan
68fa853ecb Merge pull request #1344 from edx/valera/add_back_cc_button_mouseover
Added back on hover CC button functionality.
2013-10-16 03:22:29 -07:00
Valera Rozuvan
a7f3bb2b00 Added back on hover CC button functionality.
Fixing falling test. Added fix for RequireJS & XModule loader video race condition.
Removed unnecessary comments from SCSS and JS files.
Added entry to Change Log.
2013-10-16 12:02:19 +03:00
polesye
14c63f0d59 Merge pull request #1315 from edx/anton/fix-caltulator-a11y
Add a11y to the calculator
2013-10-16 00:11:00 -07:00
polesye
99c8896cb3 Fix selector. 2013-10-16 09:43:44 +03:00
polesye
9c7418e0a8 Fix tabindex to -1. 2013-10-16 09:43:44 +03:00