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
Don Mitchell
2678f2a148 Merge pull request #1386 from edx/dhm/bug-courseid 
Allow - ~ and . in course, branch, & block ids
 2013-10-17 11:21:21 -07:00
Don Mitchell
9fc5a8a4d6 Allow - ~ and . in course, branch, & block ids 2013-10-17 13:31:44 -04:00
Giulio Gratta
5e45861dfb Merge pull request #1374 from edx/giulio/video-help-text 
Added help text to multiple speed video fields
 2013-10-17 09:46:07 -07:00
Don Mitchell
2b99947241 Merge pull request #1309 from edx/dhm/mongo_migrate 
Compute ObjectId locally rather than delegating to Mongo db
 2013-10-17 08:32:55 -07:00
Don Mitchell
dda08930cd Compute ObjectId locally rather than delegating to Mongo db 
Was following a std sql pattern, but non-sql db's are slow write
and pymongo's ObjectId() is supposed to generate a true GUID
equivalent to waiting for the db to do so.
 2013-10-17 10:49:07 -04:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets 
Add asset pagination
 2013-10-17 07:16:09 -07:00
Don Mitchell
a6ad531d50 Merge pull request #1287 from edx/dhm/restful_crud 
Restful api prototype
 2013-10-17 05:50:05 -07:00
Giulio Gratta
1fad68b5ca Adding ICE undo feature 2013-10-16 16:01:56 -07:00
Don Mitchell
fbc68df88b Ensure bootstrapping tests start w/ clean slate. 2013-10-16 16:54:31 -04:00
Don Mitchell
95ea4dc9cc Tests for Locator <-> Location help functions 2013-10-16 16:54:31 -04:00
Don Mitchell
010905eb99 RESTful api for getting course listing and opening course in studio. 
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
 2013-10-16 16:54:31 -04:00
Giulio Gratta
23bd9f5012 added help text to multiple speed video fields 2013-10-16 13:35:59 -07:00
David Baumgold
ab5664ab9d Merge pull request #1366 from edx/db/fix-video-test 
Fix video unit test
 2013-10-16 10:42:53 -07:00
David Baumgold
545563c77b Fix video unit test 2013-10-16 12:55:19 -04:00
polesye
283777dac2 Merge pull request #1297 from edx/anton/fix-lti-export 
LTI: Fix import/export.
 2013-10-16 09:54:21 -07:00
David Baumgold
e363e5a72d Merge pull request #1337 from edx/db/fix-video-requirejs 
fix video module issue with require.js
 2013-10-16 09:40:48 -07:00
brianhw
014089e62a Merge pull request #1364 from edx/ned/cherry-pick-pr-1297 
Add EmptyDataRawDescriptor.
 2013-10-16 09:09:19 -07:00
polesye
de48e4a9d6 Add EmptyDataRawDescriptor. 2013-10-16 10:39:02 -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
jmclaus
49bd356766 Used chaining. Cached gettext call. 2013-10-16 14:09:03 +02:00
jmclaus
585751ffca Updated template and fixtures 2013-10-16 14:09:03 +02:00
jmclaus
3a798adb0f Added two states to HD control: HD off - HD on 2013-10-16 14:09:03 +02:00
Valera Rozuvan
d408d7adec Enabled 2nd disabled Jasmine test. 2013-10-16 15:02:59 +03:00
David Baumgold
deb36999ca Remove outdated comment 2013-10-16 07:56:00 -04:00
Valera Rozuvan
269089711e Enabled 2 disabled Jasmine tests. Fixed them. 2013-10-16 14:15:10 +03:00
Valera Rozuvan
cf3ea89289 Rebased. Updated Jasmine describe messages to make them more clearer. 2013-10-16 13:43:58 +03:00
David Baumgold
e930b96b52 Remove references to onYouTubePlayerAPIReady and onHTML5PlayerAPIReady 2013-10-16 13:28:28 +03:00
David Baumgold
bcf4fd5f3d Mock YT.ready in Xmodule JS tests 
and disable tests that fail for unrelated reasons
 2013-10-16 13:28:28 +03:00
David Baumgold
40e540284f wait to load video module until YT API is ready 2013-10-16 13:28:28 +03:00
Valera Rozuvan
a7f3bb2b00 Added back on hover CC button functionality. 
Fixing falling test. Added fix for RequireJS & XModule loader video race condition.
Removed unnecessary comments from SCSS and JS files.
Added entry to Change Log.
 2013-10-16 12:02:19 +03:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers 
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
 2013-10-15 15:53:48 -04: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
Carlos Andrés Rocha
15852cd816 Modify export_to_xml to take an optional contentstore and work with xml courses 2013-10-15 10:48:59 -04:00
Valera Rozuvan
06a85e6ef5 Minor styling tweaks. Added Changelog entry. 
Made it so that the link and the text are on the same level, and in the
center of the block.
 2013-10-14 13:59:10 +03:00
Frances Botsford
2877345b79 styling for LTI in a new window block 2013-10-14 13:58:18 +03:00
Valera Rozuvan
068d0ce692 Added back check in JS for empty or default URL. 2013-10-14 13:58:18 +03:00
Valera Rozuvan
3c6591e065 Addressing comments by auraz and singingwolfboy. 
Removed JS check for empty url and default url. In template added
i18n support for several strings.
 2013-10-14 13:58:18 +03:00
Alexander Kryklia
f9b64cad32 Add display_name to lti template 2013-10-14 13:58:18 +03:00
Valera Rozuvan
a950bb7327 Oops. Forgot to delete one more template. 2013-10-14 13:58:17 +03:00