Commit Graph

6501 Commits

Author SHA1 Message Date
Sarina Canelake
9fb1d9ecf2 Remove 'Email Settings' link on student dashboard for unauth courses 2013-10-17 15:10:47 -04:00
brianhw
12d98daecf Merge pull request #1376 from edx/adam/disable-accounts-2
Adam/disable accounts 2
2013-10-16 15:01:46 -07:00
Adam Palay
1fc993ce18 add functionality to disable users
add middleware to detect students with disabled accounts

add tests
2013-10-16 16:57:11 -04:00
Adam Palay
421174980a add UserStanding model
add migration
2013-10-16 16:57:06 -04:00
Brian Talbot
5de21ae541 adds/relocates shared vendor css (and assets) to static directories 2013-10-16 16:45:32 -04:00
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Julia Hansbrough
fd54b060d8 added self to authors style, changed GET to POST 2013-10-16 13:01:57 -04:00
Will Daly
3f88b87916 Added acceptance tests for bulk email (through beta dashboard) 2013-10-16 13:01:57 -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
polesye
de48e4a9d6 Add EmptyDataRawDescriptor. 2013-10-16 10:39:02 -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
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
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
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
brianhw
7cfe279fb5 Merge pull request #1348 from edx/dhm/bug_publish
Delete on publish to prevent orphans
2013-10-15 11:46:57 -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
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
jmclaus
9d418755a6 Added changes made to video.html to fixtures. Addressed latest PR comments 2013-10-02 16:54:48 +02:00
jmclaus
d201ce1035 Addressed PR comments 2013-10-02 15:55:23 +02:00
jmclaus
eeb38302d3 Fixed failing test. 2013-10-02 15:55:22 +02:00
jmclaus
332bfa9627 Added more explanatory states to the Volume, Fullscreen, HD, and CC controls 2013-10-02 15:55:22 +02:00
jmclaus
a3db5da994 Code cleanup 2013-10-02 15:55:22 +02:00
jmclaus
cd12492e08 Disabled one test in video_quality_control 2013-10-02 15:55:22 +02:00
jmclaus
e5895adb2b Progress slider announces its nabe and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
a9b2f2dea0 Volume slider announces its name and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
ce976a80c8 All buttons have an ARIA role, name , and state 2013-10-02 15:55:22 +02:00
jmclaus
dfe45d5bd6 First pass at ARIA. Video player buttons announce themselves as button when used with a screen reader 2013-10-02 15:55:22 +02:00
Jay Zoldak
6e3ece92e3 Refactor upload acceptance tests and add locked asset tests for registered user 2013-10-02 08:12:58 -04:00
marco
81a2ac413d Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
2013-10-01 17:05:02 -04:00
Ned Batchelder
0bb11335b2 We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability. 2013-10-01 13:53:59 -04:00
Ned Batchelder
cdb80bb8ed Fix the new tests to use the new way to make XBlocks. 2013-09-30 21:09:44 -04:00
Ned Batchelder
718328e4e6 Get rid of all mention of XModuleDescriptor. 2013-09-30 21:09:43 -04:00
Ned Batchelder
a1d464aed9 Update XBlock requirement to new XML code. 2013-09-30 21:09:43 -04:00
Ned Batchelder
3a6450c3fc Use XModuleDescriptor.parse_xml to interpret XML. 2013-09-30 21:09:43 -04:00
Ned Batchelder
c36adf84a0 Minor cosmetic code fixes. 2013-09-30 21:09:43 -04:00
Ned Batchelder
d7e441088b Adjust parameters to construct_xblock_from_class to match XBlock repo. 2013-09-30 21:09:43 -04:00
jmclaus
aeac8dddbb All video controls have a full outline when receiving focus 2013-09-30 20:47:05 +02:00
jmclaus
427f1184ae Merge pull request #1150 from edx/jmclaus/bugfix_outline_mouseover_first_caption
First caption does not display outline on initial mouseover.
2013-09-30 07:26:30 -07:00
Vik Paruchuri
577749ff80 Merge pull request #1163 from edx/fix/vik/image-upload
Streamling, test, and fix issues with image uploading
2013-09-27 15:34:23 -07:00