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

5079 Commits

Author SHA1 Message Date
Valera Rozuvan
d0fbd502fb Initial commit for feature BLD-391: Add arrows to the interface for start/end times. 
If end time is specified (which means that there is also a start time), we
add an extra DOM element to the slider that will show the are in time between
start time and end time. Unfortunately, this visual aid will become available
ony after start of playback. This is because until then we don't know the length
of the video.
 2013-10-23 13:01:10 +03:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
Jason Bau
6e1b8749b2 Merge pull request #1440 from edx/jbau/COE-sanitize-with-bleach 
Jbau/coe sanitize with bleach
 2013-10-22 14:01:59 -07:00
Jason Bau
651ef209ac add autolinking 2013-10-22 12:04:37 -07:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Don Mitchell
8902a89fbc Have urls.py fully parse locator url 2013-10-22 10:44:03 -04:00
Don Mitchell
6ba0208fee Don't mix versions in same object: 
VersionConflictError just has version as 2nd arg
Routines wanting to create an up-to-date locator shouldn't count on constructor to override version
 2013-10-22 10:25:15 -04:00
Don Mitchell
7bc697a1f9 Parse urls in one regex w/ more consistency 2013-10-22 10:25:14 -04:00
Jason Bau
79ce043219 use bleach instead of lxml.html.clean for sanitize_html OEE 2013-10-21 21:03:30 -07:00
Don Mitchell
4f60a30afc Remove as_old_location methods 
They were incorrect if there were periods in the org or name.
 2013-10-21 17:17:20 -04:00
polesye
ffc613dc5d Merge pull request #1291 from edx/anton/fix-lti-custom-parameters 
LTI: Fix bugs related to custom parameters.
 2013-10-21 10:22:36 -07:00
Don Mitchell
4b9a1431dd Ignore collection config arg which other mongo connectors use. 2013-10-21 12:11:35 -04:00
David Baumgold
c7dcb0bb57 Attach image_input_click function to window object 
So other parts of the page can access it
 2013-10-21 11:03:44 -04:00
polesye
fa23543682 Merge pull request #1418 from edx/anton/restore-cc-button-mouseover 
Added back on hover CC button functionality.
 2013-10-21 07:47:55 -07:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
jmclaus
1810022d73 Caption functionality announced when tabbing to list 2013-10-20 21:56:12 +02:00
polesye
a1f8aca6c9 Restore functionality. 2013-10-19 09:32:36 +03:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Will Daly
4de777b716 Merge pull request #1414 from edx/will/zero-tolerance 
Zero Tolerance
 2013-10-18 13:30:34 -07:00
Don Mitchell
46201e9ee1 Merge pull request #1412 from edx/dhm/bug_id_syntax 
URLencode $ and . in location.name when used as key
 2013-10-18 13:17:03 -07:00
Will Daly
6654bb4cdf Disable flakey seek test 2013-10-18 16:10:10 -04:00
Don Mitchell
80af538dd1 URLencode $ and . in location.name when used as key 2013-10-18 16:05:02 -04:00
Will Daly
fe387fb133 Disable slider test 2013-10-18 15:59:14 -04:00
Will Daly
344e9f7f5d Fix flakey js caption test 2013-10-18 15:58:29 -04:00
polesye
70e5e80e31 Merge pull request #1339 from edx/anton/fix-video-js-unit-tests 
Fix broken tests for video player
 2013-10-18 11:45:43 -07:00
Don Mitchell
d15bfb672a Merge pull request #1407 from edx/dhm/bug_config 
Add temporary args to swallow deprecated parms.
 2013-10-18 11:39:44 -07:00
Don Mitchell
f4cf331553 Add temporary args to swallow deprecated parms. 2013-10-18 14:39:06 -04:00
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master 
Post release 2013 10 17 master
 2013-10-18 11:16:24 -07:00
Ned Batchelder
009b3e9c50 Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups 
Simple cleanups of DictFieldData
 2013-10-18 11:02:38 -07:00
polesye
1ee1eb6946 Fix comments. 2013-10-18 20:01:13 +03:00
polesye
547dc11c99 Revert "Fix a malformed custom_parameter bug." 
This reverts commit 75bdc1eebfd444bf00102b486a881f5776bbc407.
 2013-10-18 20:01:13 +03:00
polesye
a6a5300b90 Fix custom parameter. 2013-10-18 20:01:13 +03:00
polesye
e62c047fdf Fix a malformed custom_parameter bug. 2013-10-18 20:01:13 +03:00
polesye
c4bb2ac757 Remove adding prefix to custom parameters. 2013-10-18 20:01:12 +03:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
polesye
32ca988760 Fix video voulme test. 2013-10-18 18:44:48 +03:00
polesye
c85bbabb93 Fix timeout. 2013-10-18 18:44:48 +03:00
polesye
e95ee9948b Add acceptance test instead of broken js unit test. 2013-10-18 18:44:48 +03:00
polesye
7121db0a09 BLD-353: Fix js unit tests. 2013-10-18 18:44:48 +03:00
polesye
79f11de6de Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug 
Video player: Fix multi speed bug
 2013-10-18 08:09:42 -07:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" 
This reverts commit a517dc2085.
 2013-10-18 09:22:30 -04:00
Ned Batchelder
d3c7c0834d Simple cleanups of DictFieldData 
I tried to make DictFieldData strict about only being used with one
block.  That effort failed ultimately, but these are reasonable changes
I made along the way.
 2013-10-18 04:51:42 -04:00
polesye
df091e5023 Remove $.cookie. 2013-10-18 11:04:06 +03:00
polesye
dda6fbd45c Fix typo. 2013-10-18 08:51:46 +03:00
polesye
730113837b Add js unit tests. 2013-10-18 08:47:09 +03:00
polesye
eeab7847b4 Add resizing. 2013-10-18 08:47:09 +03:00
Giulio Gratta
af0239ab0b add confirm dialog to ICE reset changes 2013-10-17 14:11:05 -07:00
Giulio Gratta
0b8058d8c0 Merge pull request #1377 from edx/giulio/ICE-undo 
Tweaking ICE undo feature
 2013-10-17 13:58:45 -07:00
Giulio Gratta
db802fb543 update code to reflect comment 2013-10-17 11:30:54 -07:00
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