Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

7928 Commits

Author SHA1 Message Date
Vik Paruchuri
8cf82f2973 Fix self assessment test 2013-08-09 14:38:30 -04:00
Vik Paruchuri
6e41c082b1 Fix tests 2013-08-09 12:30:05 -04:00
marco
166c4c6939 cleaned up merge issue in combined_open_ended.html 2013-08-09 11:31:33 -04:00
marco
e1cba4b0b4 cleaned up html structure for various pages, style fixed for show/hide prompt item 2013-08-09 11:26:59 -04:00
Vik Paruchuri
2612fc2bce Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-08-09 11:23:52 -04:00
chrisndodge
09a83dcd1e Merge pull request #589 from edx/fix/cdodge/better-export-error-messaging 
give some debug message regarding why export has failed
 2013-08-09 07:21:20 -07:00
Vik Paruchuri
f929b4930a Add in jasmine test for rubric, fix combinedopenended jasmine failures 2013-08-09 08:42:02 -04:00
Vik Paruchuri
adbfdccee8 Prevent student from resetting problem unless they have completed required peer grading. Grant an exemption if there is no available peer grading. 2013-08-09 08:18:23 -04:00
Valera Rozuvan
f301231051 Enabled tabbing to volume slider. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
5380b5cfc3 Making it possible to tab through individual speeds. 
In speed control, when it is focused, a drop down becomes available which contains all
of the available speeds that the player can switch to. When using the Tab button to
tab through all of the controls, it should be possible to select individual speed with
the keyboard.
 2013-08-09 09:22:57 +03:00
Valera Rozuvan
8bbe1c39f6 Turned off all VideoAlpha Jasmine tests. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
8a3ef33985 Fixing tests related to fetching YouTube metadata. 
Previously we were using dummy YouTube IDs such as "slowerSpeedYoutubeId", and "normalSpeedYoutubeId".
This was causing errors when the code tried to fetch metadata from YouTube with that ID. We can't
stub these fetch requests because the data that is fetched is necessary. For example it contains
the length of the video.
 2013-08-09 09:22:57 +03:00
Valera Rozuvan
417bf6dd85 Removed some more comments. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
f9f9123ce4 Removed unnecessary commented out code from Jasmine tests. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
4f207299db Changed back handling of Video by original Video code. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
1f238b953b Fixed test for height of player when CC is disabled. 
It turned out that we were reading the heights of the contols and other elements
before we initialized the heights.
 2013-08-09 09:22:57 +03:00
Valera Rozuvan
326d958727 Replaced Video with VideoAlpha. 
Now all Video tags and VideoAlpha tags will be handled by VideoAlpha.
 2013-08-09 09:22:57 +03:00
Valera Rozuvan
f08394ac2c Volume and speeds dialogs are fully extended. 
When the controls receive focus not via mouse click or mouse hover, their appropriate
slider and selection menu are fully extended and shown to the user.
 2013-08-09 09:22:57 +03:00
Valera Rozuvan
740a343b76 Styling improvements. 2013-08-09 09:22:56 +03:00
Valera Rozuvan
6f431df910 Fixed bug dealing with empty subtitles Url string. 
Now when subs parameter is empty or the YouTube IDs are not specified,
captions will not try to fetch non-existent file.
 2013-08-09 09:22:56 +03:00
Valera Rozuvan
fb0efd1b16 Made it so that keyboard also prolongs auto hiding of controls. 2013-08-09 09:22:56 +03:00
Valera Rozuvan
594ed6e0c3 Fixed failing test for VideoAlpha caption heiht. 
It turns out that there was wrong invocation of toBeCloseTo() function. Most likely a typo.
Updated the readme.
 2013-08-09 09:22:56 +03:00
Valera Rozuvan
d46542cba8 Removing JavaScript qTip tooltips. 
Because sometimes the tooltips generated by qTip get in the way, and the controls becomes
not responsive, it was decided to use standard title attributes for tips.

Also along the way, an error was discoevered in Jasmine tests. It was fixed, but that test is
failing so it was marked specifically to be skipped when all VideoAlpha tests run.
 2013-08-09 09:22:56 +03:00
Valera Rozuvan
b24ee15568 Fixed styling for volume button. 
For some reason the "muted" icon was not showing. Styles have been corrected.Now on focus background color is also simplified for div
.volume control.
 2013-08-09 09:22:56 +03:00
Valera Rozuvan
bc503c88c6 Making it possible to tab to captions. 
When a VideoAlpha is present on the page, if the user tries to tab through out the entire page, eventually he will land on the VideoAlpha controls. The tab index order has been set up so that all control receive focus eventually in the order from left to right. When a control receives focus, it is hilighted. The last tab focuses the captions dialog. When the captions dialog has focus, the Up and Down arrows can scroll it up and down.
 2013-08-09 09:22:56 +03:00
Chris Dodge
481eac7fc8 address PR feedback 2013-08-08 21:25:42 -04:00
Chris Dodge
55bfe46e79 need to filter out non-own metadata. Also we need to clone draft content 2013-08-08 21:25:42 -04:00
Chris Dodge
fcaf3e6329 give some debug message regarding why export might fail 2013-08-08 21:01:38 -04:00
Vik Paruchuri
e39abe11db Fix rubric with staff grading 2013-08-08 19:50:55 -04:00
Vik Paruchuri
e4bcfa5c21 Fix indents and copy behavior 2013-08-08 19:31:34 -04:00
Vik Paruchuri
687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
 2013-08-08 19:03:46 -04:00
Vik Paruchuri
a9926f0460 Display message to student when they cannot see their peer grading feedback yet. 2013-08-08 18:43:54 -04:00
Vik Paruchuri
900377e4ee Return written feedback 2013-08-08 17:53:29 -04:00
Vik Paruchuri
d44b2e62a0 Proper partial credit checks 2013-08-08 17:19:06 -04:00
Vik Paruchuri
f59045c3f9 Scope rubrics locally, make them into classes 2013-08-08 16:54:39 -04:00
Vik Paruchuri
803b7eb2af Fix peer grading rubric issue. Redo peer grading JS to scope locally 2013-08-08 16:31:36 -04:00
Vik Paruchuri
15b0e12068 Remove progress indicators, make rubric display properly 2013-08-08 14:02:33 -04:00
Vik Paruchuri
fd38223244 Fix grading submitted messages 2013-08-08 13:31:43 -04:00
Vik Paruchuri
bd9097596c Remove annoying rubric parsing error, redo how notifications work 2013-08-08 13:16:32 -04:00
Vik Paruchuri
45d94c17f7 Add in next button, get rid of error with deleted peer grading module 2013-08-08 12:46:43 -04:00
Vik Paruchuri
203b1176cd Don't check for ETA, or check peer grading data in self assessment 2013-08-08 12:14:57 -04:00
Christina Roberts
36b889349d Merge pull request #610 from edx/christina/popup-css 
Workaround for popup CSS path being wrong (tinymce).
 2013-08-08 07:40:16 -07:00
Vik Paruchuri
17c77dd157 Merge pull request #392 from edx/fix/vik/answer-unknown 
Simplify save_grade and pass through answer_unknown
 2013-08-08 07:28:03 -07:00
Vik Paruchuri
4b5aba29ca Fix defaults 2013-08-08 09:52:13 -04:00
cahrens
1bb29e5414 Workaround for popup CSS path being wrong (tinymce). 
STUD-178
 2013-08-08 09:50:54 -04:00
David Baumgold
be103dfa0d improving code style 2013-08-08 09:46:15 -04:00
chrisndodge
ece4ec3f57 Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls 
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
 2013-08-08 06:32:35 -07:00
Vik Paruchuri
c9ddcd7868 Fix some pep8 violations 2013-08-08 08:34:40 -04:00
Vik Paruchuri
62c7255ac4 Use getlist 2013-08-08 08:34:40 -04:00
Vik Paruchuri
8b228dd64b Fix bad key naming 2013-08-08 08:34:39 -04:00