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

21882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
louyihua
a458b90d37 Fix incorrect parse of url in video_module.py 
Sometimes the video url may look like 'http://abc.com/path/video.mp4?xxxx'.
(For example, the Windows Azure's media service will offer such type of url.)
The original code in video_module.py will produce 'mp4?xxxx' instead of 'mp4'
as the extension of a filename for such type of url, and therefore the video
will be non-playable. The fix here uses the built-in urlparse module to retrive
only the path component from a url and therefore the extension 'mp4' will be
correctly fetched.
 2014-03-19 10:30:25 +08:00
Mark Hoeber
a795edcf22 Merge pull request #2666 from pdehaye/patch-2 
further explanation on entry_points
 2014-03-17 17:11:02 -04:00
David Baumgold
6e0a455cd7 Merge pull request #2730 from ionis-education-group/fix-static-urls 
Fix URLs for static resources
 2014-03-17 17:00:30 -04:00
Adam
76566be21b Merge pull request #2939 from edx/zub/story/disableunicodecourseids 
Enable/disable unicodes in course id's
 2014-03-17 12:04:51 -04:00
Calen Pennington
c4c998b55a Merge pull request #2954 from cpennington/pure-xblocks-progress-page 
Fix LMS-2349 (Progress page broken for pure xblocks)
 2014-03-17 12:01:30 -04:00
Mark Hoeber
945d8e0528 Merge pull request #2881 from edx/markhoeber/documentation/ca-reorg-real 
Markhoeber/documentation/ca reorg real
 2014-03-17 11:44:15 -04:00
Mark Hoeber
8100e38f3f edX Course Authors Doc Reorganization 2014-03-17 11:43:32 -04:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Dave St.Germain
372d0846fd Merge pull request #2932 from edx/dcs/fix-matlab-input 
This fixes LMS-2387 by removing a resize call that prevented scrolling.
 2014-03-17 11:15:01 -04:00
Calen Pennington
a5498bcbd7 Make progress page work with pure xblocks 
[LMS-2349]
 2014-03-17 10:45:14 -04:00
Calen Pennington
290fd03566 Add tests that verify progress page with pure XBlocks 
This is known to be broken.

[LMS-2349]
 2014-03-17 10:44:37 -04:00
Dave St.Germain
2a20b3f67e This fixes LMS-2387 by removing a resize call that prevented scrolling. 
It also enables syntax highlighting for matlab input fields, which
wasn't previously enabled.
 2014-03-17 10:35:53 -04:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory 
Dhm/meld pretty factory
 2014-03-17 09:44:19 -04:00
Alexander Kryklia
13ef23c308 Merge pull request #2786 from edx/alex/fix_download_html5_subs 
Fix donwload subs for non youtube videos and non-en language.
 2014-03-17 12:48:27 +02:00
Waheed Ahmed
70233a96d7 Merge pull request #2926 from edx/waheed/lms2195-localization-fix-on-staff-grading-page 
Internationalization fixed for error msg on staff grading page.
 2014-03-17 13:15:23 +05:00
Waheed Ahmed
741881b360 Internationalization fixed for error msg on staff grading page. 
LMS-2195
 2014-03-17 12:38:20 +05:00
Sarina Canelake
137faf4407 Merge pull request #2951 from edx/sarina/031514-language-update 
Update translations (autogenerated message)
 2014-03-15 16:21:20 -04:00
Sarina Canelake
da6fdc332b Update translations (autogenerated message) 2014-03-15 15:40:08 -04:00
Mark Hoeber
16523b9912 Merge pull request #2947 from edx/markhoeber/documentation/doc-34 
Edits from Alison's initial review
 2014-03-14 15:52:33 -04:00
Mark Hoeber
bb85698450 Edits from Alison's initial review 
DOC-34
 2014-03-14 15:02:35 -04:00
srpearce
f666b8542c Merge pull request #2943 from edx/sylvia/documentation/BLD-850 
Consolidate information from data.edx.org, Appendix E, and problem types
 2014-03-14 14:37:19 -04:00
Carlos Andrés Rocha
f7892da063 Merge pull request #2944 from rocha/improve-dumps-course-ids-tests 
Improve dump_course_ids test for unicode course_ids
 2014-03-14 13:54:07 -04:00
Alexander Kryklia
dd20e84c84 Fix donwload subs for non youtube videos and non-en language. 
Check for status in test.
Add test for track url.
Fix test to use cookie.
Use download_track in feature file.
Add new tests for get_transcript.
Add html5 test.
Add content check.
Add tests for available_translations dispatch.
Disable flaky cms test.
Add  w/o english transcript tests.
Add to changelog.
 2014-03-14 18:30:42 +02:00
Carlos Andrés Rocha
e5c042aa4f Improve dump_course_ids test for unicode course_ids 2014-03-14 10:21:31 -04:00
Sylvia Pearce
6c20d1bace Consolidate information from data.edx.org, Appendix E, and problem types 2014-03-14 09:41:10 -04:00
Julia Hansbrough
ac6b9f8e2a Merge pull request #2936 from edx/flowerhack/dark-lang-docs 
Fixed confusing docstring
 2014-03-13 18:44:32 -04:00
Julia Hansbrough
08939b64dc Fixed confusing docstring 2014-03-13 22:09:29 +00:00
David Baumgold
73d0d093f9 Merge pull request #2654 from pdehaye/patch-1 
missed rst
 2014-03-13 16:34:18 -04:00
frances botsford
c87a1138a3 Merge pull request #2923 from lduarte1991/master 
CSS changes regarding TinyMCE in annotation tool & accessibility issues
 2014-03-13 12:55:55 -04:00
Christina Roberts
cbbf38b40a Merge pull request #2838 from edx/andya/container-publishing 
Support publishing of nested xblocks
 2014-03-13 12:34:22 -04:00
Alexander Kryklia
e457135ee7 Merge pull request #2931 from edx/alex/allow_uppercase_srt_extension 
Allow uppercase transcripts srt extension.
 2014-03-13 18:27:35 +02:00
Andy Armstrong
891cf8bb08 Merge pull request #2924 from edx/andya/studio-split-test-support-2 
Fix split_test xblock so that it can render in Studio
 2014-03-13 12:11:01 -04:00
cahrens
5166461c62 Don't translate reference code. 2014-03-13 11:58:26 -04:00
cahrens
496a6b8be6 Improve text referencing link for translators. 2014-03-13 11:58:08 -04:00
cahrens
1453a86122 Minor code cleanup. 2014-03-13 11:57:30 -04:00
Alison Hodges
2218764e94 Merge pull request #2930 from edx/ahodges/documentation/updateindex 
Added internal refs to help researchers find the data format files
 2014-03-13 11:25:16 -04:00
Alison Hodges
d65a216d69 Added internal refs to help researchers find the data format files 2014-03-13 11:24:11 -04:00
Alexander Kryklia
7fe675b1d0 Allow uppercase transcripts srt extension. 2014-03-13 17:06:17 +02:00
Sarina Canelake
7d2f9b88e3 Merge pull request #2857 from edx/adam/new-data-download 
Update data download dash for parity (LMS-1203)
 2014-03-13 10:58:50 -04:00
Sarina Canelake
52c38a9192 Merge pull request #2927 from edx/adam/allow_usernames_or_email 
make widget accept usernames or emails (LMS-1438)
 2014-03-13 10:57:23 -04:00
Dave St.Germain
2261aa81ed Merge pull request #2929 from edx/dcs/add-cssjs-to-codemirror 
Fixes STUD-1434 by including the CodeMirror css mode in codemirror-compressed.js
 2014-03-13 10:42:03 -04:00
Carlos Andrés Rocha
67ab115169 Merge pull request #2920 from rocha/make-course-export-related-command-unicode-aware 
Support unicode in course ids when dumping all courses
 2014-03-13 10:30:08 -04:00
Dave St.Germain
da72cd355d Fixes STUD-1434 by including the CodeMirror css mode in 
codemirror-compressed.js
 2014-03-13 10:12:25 -04:00
Alison Hodges
32d6eed2c4 Merge pull request #2795 from edx/ahodges/documentation/studentdata 
Ahodges/documentation/studentdata
 2014-03-13 09:34:27 -04:00
Alison Hodges
a5cc790835 Updates and corrections for DOC-169 2014-03-13 09:32:44 -04:00
Sarina Canelake
6ca099d5b6 Acceptance tests for beta instructor dash 
LMS-1203
 2014-03-13 07:49:40 -04:00
Adam Palay
4874f21f6f Inst Dash membership widget accepts usernames 
In addition to email addresses. LMS-1438
 2014-03-13 07:44:07 -04:00
Adam Palay
74714c4ed7 Update data download dash for parity (LMS-1203) 2014-03-13 06:47:40 -04:00
Carlos Andrés Rocha
9ecf2c00c0 Support unicode in course ids when dumping all courses 
Fixes: AN-657
 2014-03-12 18:02:05 -04:00
Andy Armstrong
58483c0649 Fix split_test xblock so that it can render in Studio 
This change addresses STUD-1403 where split_test modules could not render in Studio.
It changes Studio to pass a new parameter 'runtime-type' of 'studio' when rendering
 an xblock. In split_test, this will then cause all of the children to be rendered,
 rather than just the one that matches the conditional.
 2014-03-12 17:21:04 -04:00