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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JonahStanley
0595459c01 Revert back to old way of logging someone else in 2013-08-09 15:27:46 -04:00
Peter Fogg
cde8ee50d7 Fix jumping to the top of the page on unit delete. 2013-08-09 15:18:08 -04:00
Vik Paruchuri
6543343388 Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui 2013-08-09 14:51:13 -04:00
Vik Paruchuri
33da3ec1cf Fix self assessment template 2013-08-09 14:50:57 -04:00
cahrens
835edbf32f Change locators to a restful interface. 
Don't use ; @ and # as separators.
 2013-08-09 14:49:32 -04:00
Vik Paruchuri
8cf82f2973 Fix self assessment test 2013-08-09 14:38:30 -04:00
Miles Steele
e9aca13636 enable beta dashboard 2013-08-09 14:22:56 -04:00
Miles Steele
f6fc1aeed9 hide empty management list selector, add explanation text 2013-08-09 14:22:56 -04:00
Miles Steele
58c6b9bb61 add privilege copy 2013-08-09 14:22:55 -04:00
Miles Steele
53bda391ae Merge pull request #625 from edx/fix/msteele/instr-i18n 
Fix enroll-multiple button
 2013-08-09 11:05:32 -07:00
JonahStanley
8feaa0ffa4 Added in a wait upon logging in 2013-08-09 13:57:22 -04:00
Miles Steele
8f8d70aeae fix enroll multiple button, fix module_error report 2013-08-09 13:45:27 -04:00
Feanil Patel
822f3a7865 Merge pull request #607 from edx/feanil/master_with_release 
Feanil/master with release
 2013-08-09 10:44:44 -07:00
Adam
abd17a2472 Merge pull request #623 from edx/adam/unicode-encode-error 
make template string unicode
 2013-08-09 10:35:32 -07:00
Miles Steele
25d45b8578 Merge pull request #574 from edx/feature/msteele/instrdash 
Add cronjob analytics to instructor dashbaord
 2013-08-09 10:26:50 -07:00
Vik Paruchuri
6e41c082b1 Fix tests 2013-08-09 12:30:05 -04:00
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -04:00
Will Daly
9769f364e1 Updated tests to weaken "number" input field requirement, which 
isn't supported in Firefox.
 2013-08-09 12:10:53 -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
5d16bc9eb6 Remove ad-hoc patch for xblock issue 2013-08-09 11:24:07 -04:00
Vik Paruchuri
2612fc2bce Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-08-09 11:23:52 -04:00
Sarina Canelake
0f9d7230c3 Merge pull request #614 from edx/sarina/update-xblock-version 
Update the XBlock version to fix save bugs
 2013-08-09 07:51:28 -07: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
Brian Talbot
5b4c15a57d Studio: revises export prompt control copy 2013-08-09 10:01:23 -04: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
0b58c22b97 Merge pull request #593 from edx/valera/captions_keyboard_access_2 
Valera/captions keyboard access 2
 2013-08-09 00:49:28 -07:00
Valera Rozuvan
1efea116f6 Removed unnecessary leading and trailing spaces from heading in template. 2013-08-09 10:26:18 +03: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
4c7250a000 Improved strings in template. 
Only relevant part of string will go through the Python internationalization function.
 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
chrisndodge
bc2a9fc21b Merge pull request #609 from edx/fix/cdodge/clone-course-needs-to-save-only-own-metadata 
[STUD-608] django-admin clone_course needs to properly copy metadata as well as draft content
 2013-08-08 19:18:03 -07:00
Chris Dodge
481eac7fc8 address PR feedback 2013-08-08 21:25:42 -04:00
Chris Dodge
7b4388ba8c add more testing. Assert that metadata is properly cloned and that draft content is cloned as well 2013-08-08 21:25:42 -04:00