Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,661 Commits 1 Branch 0 Tags
545563c77ba2cb3bc7eea426454bb1483375f7dc
Commit Graph

18661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
545563c77b Fix video unit test 2013-10-16 12:55:19 -04: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
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
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
polesye
a94748dedf Fix fixture. 2013-10-16 09:43:44 +03:00
polesye
6d52d56b50 Change aria-label attribute to title. 2013-10-16 09:43:44 +03:00
polesye
a962306419 Fix js unit tests. 2013-10-16 09:43:44 +03:00
polesye
524388dbb8 Add a11y. 2013-10-16 09:43:44 +03:00
polesye
12d2c47c9f Fix BLD-165. 2013-10-16 09:43:44 +03:00
polesye
f00f900149 Fix styles. 2013-10-16 09:43:44 +03:00
Will Daly
adc46716b6 Wait for non-blank link in course-overview test 2013-10-15 21:21:09 -04:00
Christina Roberts
ccd692dd86 Merge pull request #1133 from edx/jkarni/fix/customtag-error 
Jkarni/fix/customtag error
 2013-10-15 14:23:45 -07:00
Will Daly
52a475885c Merge pull request #1350 from edx/db/enable-tender 
re-enable tender
 2013-10-15 14:10:43 -07:00
Ned Batchelder
341c6891d5 Merge pull request #1353 from edx/ned/rename-requests 
Rename contentstore/views/requests to helpers
 2013-10-15 14:01:36 -07:00
Julian Arni
d9ba410388 Review fixes 2013-10-15 16:52:35 -04:00
Julian Arni
9798da413d Review fixes 2013-10-15 16:16:10 -04:00
Frances Botsford
de1ee17323 fixing alignment error on studio component error message, i18n error message 2013-10-15 16:16:09 -04:00
Julian Arni
b7485fd812 Review fixes 2013-10-15 16:16:09 -04:00
Frances Botsford
9f188ed20c additional copy and styling for component syntax error in studio 2013-10-15 16:16:09 -04:00
Julian Arni
2721966d76 Added acceptance tests for get_html exception handling 
Make tests conform to new import UI
 2013-10-15 16:16:09 -04:00
Frances Botsford
faadc33fcc leveraging some of the existing notification styling for component errors in studio 2013-10-15 16:16:09 -04:00
Julian Arni
62a8c420ed Check for exceptions when rendering studio and students views. 
Otherwise it's possible to reach stuck states.
 2013-10-15 16:16:09 -04:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers 
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
 2013-10-15 15:53:48 -04:00
Brian Talbot
e825cfb1db Merge pull request #1311 from edx/talbs/fix-studio-importui 
Studio: FIX - Import Status UI Consistency
 2013-10-15 11:29:48 -07:00
David Baumgold
eec7118f2b enable tender 
This reverts commit 96485694d3.
 2013-10-15 14:19:26 -04:00
cahrens
00ebcf7fe7 Move index code into index.js. 2013-10-15 14:14:55 -04:00
Christina Roberts
8e45668a83 Merge pull request #1329 from edx/christina/import-cleanup 
Remove dead code and move import code into import.js.
 2013-10-15 11:11:30 -07:00
Christina Roberts
54498e15ae Merge pull request #1328 from edx/christina/toggle-sock 
Move sock JS code into its own file.
 2013-10-15 10:55:44 -07:00
Brian Talbot
8769a1a687 Studio: revises layout for success step and actions in import view 2013-10-15 13:44:33 -04:00
Carlos Andrés Rocha
fae5a5ff20 Merge pull request #1289 from rocha/dump-course-command 
Export course command
 2013-10-15 10:26:48 -07:00
cahrens
75071b6b8b Typo. 2013-10-15 13:26:47 -04:00
cahrens
5dd8e49179 Move import code into import.js. 2013-10-15 13:26:47 -04:00
cahrens
c53d86d684 Remove unreferenced code. 2013-10-15 13:26:47 -04:00
Christina Roberts
7ed8a3b801 Merge pull request #1327 from edx/christina/kill-toast 
Don't need toast message.
 2013-10-15 10:24:14 -07:00