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

6552 Commits

Author SHA1 Message Date
Will Daly
c66b5dc3d4 Added acceptance tests for bulk email (through beta dashboard) 2013-10-10 17:06:38 +00:00
Will Daly
f37e12182e Merge pull request #1296 from edx/will/tolerant-wait-for-requirejs 
Make wait_for_requirejs more tolerant of errors
 2013-10-10 08:13:34 -07:00
frances botsford
187fc8ea1c Merge pull request #1280 from edx/fix/frances/lms-video-dl-buttons2 
Improving the video and transcript download buttons
 2013-10-10 07:10:38 -07:00
Frances Botsford
5d509c2e08 addressing review feedback on video buttons - switched to use themeable color variables 2013-10-10 10:09:43 -04:00
Will Daly
3376eb0f46 Make wait_for_requirejs more tolerant of errors 2013-10-10 09:59:54 -04:00
Jay Zoldak
ce8eaa713e Merge pull request #1284 from edx/zoldak/fix-video-js-test 
Fix intermittently failing video js tests
 2013-10-09 15:08:23 -07:00
Ned Batchelder
d42a350784 Merge pull request #1279 from edx/ned/remove-cache-warning-from-tests 
Remove the now-unused import.
 2013-10-09 13:33:35 -07:00
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation 
Segregate the mongo db config from the modulestore config
 2013-10-09 13:24:30 -07:00
David Baumgold
6c747e31bc Merge pull request #1273 from edx/db/fix-drag-and-drop-requirejs 
make drag_and_drop component work with requirejs and changed static url
 2013-10-09 12:16:55 -07:00
Jay Zoldak
ac4ac23d25 Fix intermittently failing video js tests 2013-10-09 15:16:45 -04:00
Frances Botsford
729c0bca09 updating video download links to a list - review feedback 2013-10-09 14:40:01 -04:00
Frances Botsford
5653112f5e ux cleanup of video and transcript download buttons 2013-10-09 12:02:09 -04:00
David Baumgold
8906cffb22 correct placement of baseUrl variable, use it to configure requirejs 2013-10-09 11:28:46 -04:00
Ned Batchelder
9cd0771fd0 Merge pull request #1272 from edx/ned/remove-cache-warning-from-tests 
Use a better metadata_cache_key
 2013-10-09 08:18:46 -07:00
Will Daly
93edfb0b49 Merge pull request #1268 from edx/will/fix-problem-acceptance 
Guard against StaleElementException in css_click
 2013-10-09 07:52:38 -07:00
David Baumgold
e53680bb92 make drag_and_drop component work with requirejs and changed static url 2013-10-09 10:26:22 -04:00
Calen Pennington
46ed857c1a Merge pull request #1221 from cpennington/lms-xblock-css-js 
Put XBlock css and javascript onto the LMS courseware page
 2013-10-09 07:21:39 -07:00
Ned Batchelder
13f120b0ca Remove the now-unused import. 2013-10-09 10:03:46 -04:00
Calen Pennington
2514dca550 Put XBlock css and javascript onto the LMS courseware page 
This required changing structural XModules to fully implement
student_view, rather than just returning the HTML of their children in a
get_html call.

[LMS-223]
[LMS-1170]
 2013-10-09 09:40:47 -04:00
Ned Batchelder
192222f2cc Use a better metadata_cache_key 
The old code created keys like "('course', 'org')", and the space
character caused a warning from Django during tests.  Also, strings are
probably better than tuples for keys.
 2013-10-09 09:27:25 -04:00
Will Daly
936b933a46 Guard against StaleElementException in css_click 2013-10-09 07:21:38 -04:00
Carlos Andrés Rocha
779ff4fd38 Merge pull request #1245 from rocha/add-grade-to-problem-check-event 
Add module grade to problem_check tracking log event
 2013-10-08 14:00:07 -07:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
d785b1e213 Convert due_date_display_format tests to use factories 
Previously, these tests modified due_date, which failed due to the new
restrictions on writing to Scope.settings from the LMS.
 2013-10-08 15:29:17 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config 
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
 2013-10-08 15:01:48 -04:00
Carlos Andrés Rocha
7749bbbe51 Add module grade to problem_check tracking log event 2013-10-08 13:53:35 -04:00
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