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

6523 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
e0fb94cc55 Cleanup mongodb authentication 
Authenticate to the database before getting a reference to the
collection.
 2013-10-08 11:26:29 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance 
Use assertIsInstance where we can
 2013-10-08 07:47:21 -07:00
Valera Rozuvan
e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover 
Valera/add option transcripts remove onhover
 2013-10-08 07:37:02 -07:00
Christina Roberts
c5733015fd Merge pull request #611 from edx/peter-fogg/draggabilly 
Rework drag/drop on overview and subsection pages.
 2013-10-08 07:14:34 -07:00
Valera Rozuvan
2cc25873e9 Fixing Jean Michel access. bug. 2013-10-08 16:52:21 +03:00
Valera Rozuvan
deb0ad492a Enabling showing of captions always when mouse is over CC. 2013-10-08 12:00:08 +03:00
polesye
f57d5a61d3 Tidy up the code. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
92494ccdd4 Fixing minor typo. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
60c528a9be Minor tweak. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
b3a9f63de6 Furthe addressing comments on PR. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
95b74930f6 Fixing JS. 
There were previous merge conflicts in the file.
 2013-10-08 12:00:07 +03:00
Valera Rozuvan
fc43a81dbe Updated fixtures for Jasmine tests. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
74cbe11934 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-08 12:00:06 +03:00
Valera Rozuvan
812b085b84 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-08 12:00:06 +03:00
Valera Rozuvan
62c445d001 Updated code fomat in test Jasmine. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
38dfde1296 Work in progress. 2013-10-08 12:00:06 +03:00
Ned Batchelder
a4bf549af4 Use assertIsInstance instead of assertTrue(type(x) == y) 2013-10-07 18:20:31 -04:00
Ned Batchelder
9103fa393c Use assertIsInstance. 2013-10-07 18:17:40 -04:00
cahrens
61cfb91218 Cleanup to drag and drop implementation. 
Also includes RequireJS changes.

Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
 2013-10-07 17:18:40 -04:00
Peter Fogg
2d3cba06d2 Rework course overview drag and drop. 
Failed drags bring the element back to where it started; elements are
locked to the y-axis, states are represented as CSS classes for
styling, elements can be dragged across section/subsection borders,
and dragging to the top/bottom of a section Just Works™.

Needs some styling love to give visual representation of where the
dragged element will drop, though.

TODO: It'd be good to have auto expand/collapse for subsections.
 2013-10-07 17:17:46 -04:00
Will Daly
b749300d43 Use css_has_value() to fix failure in course-overview.feature 2013-10-07 16:08:39 -04:00
Will Daly
3257a7baf2 Refactored navigation feature 
Fixed grading tests
 2013-10-07 09:41:18 -04:00
jmclaus
4bb9dcf190 Merge pull request #1220 from edx/jmclaus/bugfix_bypass_captions 
Captions are now removed from tab order when hidden
 2013-10-04 15:02:45 -07:00
Julian Arni
f095f3c8c8 Merge branch 'release' 2013-10-04 17:34:49 -04:00
Nick Parlante
5d995ddb5c Merge pull request #1228 from edx/nick/fix-customization-visibility 
Bug fix - text_customization should not show in settings
 2013-10-04 13:50:49 -07:00
jmclaus
4f59e6bbee Captions are now removed from tab order when hidden 2013-10-04 22:16:59 +02:00
Nick Parlante
ad7c3f932b Bug fix - text_customization should not show in settings 
Also change test to not expect text_customization
 2013-10-04 12:55:28 -07:00
Julian Arni
dadc766fc0 Use wrapped tar extraction 
Signed-off-by: Julian Arni <julian@edx.org>
 2013-10-04 15:47:58 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
ichuang
5b460ff6b7 add inline style flag to formulaequationinput 2013-10-04 11:56:50 -04:00
Diana Huang
3ec8df9f5e Merge pull request #1216 from edx/diana/dashboard-cleanup 
Some dasbhoard template cleanup
 2013-10-04 06:17:06 -07:00
Nick Parlante
32bf5b93b2 Merge pull request #1106 from edx/nick/customization 
Targeted string customization in the lms UI
 2013-10-03 14:41:36 -07:00
Diana Huang
ed5168ec61 Move more dashboard logic into the views 2013-10-03 16:22:00 -04:00
Nick Parlante
cca6876a3c Targeted string customization in the LMS UI 
Add the text_customization dict in advanced settings, which contains
customizations checked in specific spots. Here it is used to enable
the customization of the "Check" and "Final Check" button titles
under the keys custom_check and custom_final_check.
 2013-10-03 11:31:40 -07:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Diana Huang
7ba38c0ff3 Refactor out logic for individual course listings. 2013-10-03 14:08:38 -04:00
Ned Batchelder
2a11ff0bdb Merge pull request #1198 from edx/ned/fix-calling-classmethods 
No need to invoke classmethods through self.__class__
 2013-10-03 10:28:39 -07:00
Ned Batchelder
a1be970153 Merge pull request #1194 from edx/ned/quiet-tests 
Quiet down exceptions at startup, and during tests
 2013-10-03 08:21:37 -07:00
Diana Huang
bc9f86fd16 Merge pull request #1205 from edx/diana/fix-course-mode-expiration 
Fix parentheses so that we only pull the course modes we want.
 2013-10-03 05:33:43 -07:00
Will Daly
01830c30bc Merge pull request #1202 from edx/will/chrome-not-reachable 
Catch WebDriver exceptions when creating selenium browser
 2013-10-03 04:42:13 -07:00
jmclaus
38642d2888 Merge pull request #1175 from edx/jmclaus_bugfix_video_player_controls_a11y 
Bug fix video player controls a11y
 2013-10-02 13:53:48 -07:00
Don Mitchell
0521bec4e2 Merge pull request #1203 from edx/dhm/bug_publish 
Fix publishing in old mongo
 2013-10-02 13:23:51 -07:00
Diana Huang
52c4395a03 Fix parentheses so that we only pull the course modes we want. 2013-10-02 16:14:26 -04:00
Don Mitchell
5e1f03bb52 Publish removes deleted children 2013-10-02 16:06:58 -04:00
Don Mitchell
18c45879bc Test reproducing orphaning of children 
when draft is deleted and then parent published.
ensure moving doesn't cause deletion
 2013-10-02 16:06:58 -04:00
polesye
2a2c9d1989 Fix regexp. 2013-10-02 21:45:38 +03:00
polesye
960c2ec472 Fix acceptance tests. 2013-10-02 20:23:42 +03:00
Will Daly
05669fadde Catch WebDriver exceptions when creating selenium browser 2013-10-02 12:18:13 -04:00
jmclaus
9d418755a6 Added changes made to video.html to fixtures. Addressed latest PR comments 2013-10-02 16:54:48 +02:00
Ned Batchelder
3bbdd2f4c3 No need to invoke classmethods through self.__class__ 2013-10-02 10:35:58 -04:00