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

6334 Commits

Author SHA1 Message Date
MarCnu
77f7f26933 Add HTTP_RANGE compatibility for ContentStore file streaming 
Currently, users can only download ContentStore files from first byte to
last byte.

With this change, when a request to the ContentStore includes the HTTP
"Range" parameter, it is parsed and StaticContentStream will stream the
requested bytes.

This change makes possible to stream video files (.mp4 especially) from
the ContentStore. Users can now seek a specific time in the video
without loading all the file.

This is useful for courses with a limited number of students that
doesn't require a dedicated video server.
 2014-08-19 16:46:31 +02:00
Don Mitchell
3c3a316f08 Make it branch agnostic 
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
 2014-08-18 16:19:46 -04:00
Don Mitchell
23d78fe7fc Merge pull request #4803 from edx/dhm/import_split_test 
Dhm/import split test
 2014-08-15 17:23:33 -04:00
Don Mitchell
3b43f34b20 XML export maps keys into xml expected format 2014-08-15 16:02:48 -04:00
Alexander Kryklia
ccf85a9431 Merge pull request #4777 from edx/anton/sync-groups-and-verticals 
Anton/sync groups and verticals
 2014-08-15 20:15:12 +03:00
Christina Roberts
33815f1cc5 Merge pull request #4853 from edx/christina/stud-2093 
Add a request-token to identify which xblock html was rendered as part o...
 2014-08-15 12:55:34 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register 
Auto enroll students even if there are multiple course modes
 2014-08-15 11:11:19 -04:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes 
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
 2014-08-15 10:26:27 -04:00
Sarina Canelake
f3a0327541 Merge pull request #4841 from edx/sarina/minor-i18n-fixes 
Minor i18n fixes prompted by translators
 2014-08-14 18:03:54 -04:00
Sarina Canelake
19ca6c845c Minor i18n fixes prompted by translators 2014-08-14 14:58:26 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Don Mitchell
aa1b9fece9 Properly (de)serialize references in old mongo 
LMS-11204
 2014-08-13 11:26:12 -04:00
Don Mitchell
5789b98b63 Merge pull request #4759 from edx/dhm/key_munging 
Remove hardcoding of key syntax for base url
 2014-08-13 09:36:08 -04:00
Jesse Zoldak
2edf1aef31 Merge pull request #4798 from edx/zoldak/rmtree-cleanup 
Ignore errors on rmtree cleanup
 2014-08-12 17:05:20 -04:00
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Jesse Zoldak
9a25c9ff54 Ignore errors on rmtree cleanup 2014-08-12 12:30:37 -04:00
Ivica Ceraj
be17040f9d Fix for empty imsx_messageIdentifier 2014-08-12 08:30:33 -04:00
Jason Bau
b55362b925 make unit tests respect mongo port/host settings (with default) 
settings are read in from environment variable
 2014-08-11 14:17:29 -07:00
Calen Pennington
25963797c6 Merge pull request #3227 from FiloSottile/enforce_type 
Enforce type of the XBlocks Fields when set
 2014-08-11 16:13:53 -04:00
Don Mitchell
05bddae34a Merge pull request #4633 from edx/dhm/create_xthing 
Make import/export work with split mongo, replace create_xmodule with create_xblock
 2014-08-11 12:53:59 -04:00
Don Mitchell
192d701899 Code review changes re split import/export, create_xblock 2014-08-11 12:13:31 -04:00
Diana Huang
83f7acffca Merge pull request #4764 from edx/diana/show-cert-without-end-date 
Show Certificates Before End
 2014-08-08 15:36:39 -04:00
Don Mitchell
21c6812bd3 More branch override precedence refinement 2014-08-08 15:00:48 -04:00
Don Mitchell
67d6347e50 Use continue version for create course side effects 2014-08-08 15:00:48 -04:00
Nimisha Asthagiri
ba8d390fd7 Support import of ErrorDescriptors. 2014-08-08 15:00:48 -04:00
Don Mitchell
7a75b94ff7 Support xml blocks w/ multiple parents 2014-08-08 15:00:47 -04:00
Don Mitchell
e900a47b3f Provide workarounds for skip_draft where other code doesn't want its behavior 2014-08-08 15:00:47 -04:00
Diana Huang
0c3c7b5ab5 Merge pull request #4754 from edx/diana/show-cert-without-end-date 
Show Certificates Before End
 2014-08-08 14:58:02 -04:00
Don Mitchell
5fc30dc4f6 Move about overview creation to common superclass 2014-08-08 14:56:57 -04:00
Nimisha Asthagiri
70c77f48b8 fixup - re-enable Asset checking. 2014-08-08 14:54:15 -04:00
Don Mitchell
9254cfa9ce Import depth first to help w/ publishing 2014-08-08 14:53:37 -04:00
Don Mitchell
2726b437bc Trying to get split to work 2014-08-08 14:53:37 -04:00
Calen Pennington
b87d469c89 Add make_course_key to modulestores, so that external clients don't need to assume a CourseKey subtype. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2014-08-08 14:44:53 -04:00
Nimisha Asthagiri
84992cdfa5 Refactor xml_importer.py for easier reading. 
Remove post-publish step.
 2014-08-08 14:41:57 -04:00
Don Mitchell
47851c5041 Replace create_xmodule with create_xblock 
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2014-08-08 14:40:27 -04:00
Oleg Marshev
0577b9d8b9 Allow turning off Video CDN in Studio. 
BLD-1207
 2014-08-08 14:39:19 -04:00
Don Mitchell
0d21381001 Remove hardcoding of key syntax for base url 
and /static and /jump_to_id link substitutions
LMS-11198
 2014-08-08 14:33:59 -04:00
Diana Huang
7865e2fb3c Move certificates_show_before_end into a new variable 
Mark it as deprecated, but maintain backwards compatibility.

ECOM-11
 2014-08-08 14:29:57 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Filippo Valsorda
a9930bf34a Make enforce_type an optional flag, to avoid conflicts 2014-08-08 09:14:10 -07:00
Filippo Valsorda
5edfc479b1 Add xmodule fields enforce_type tests 2014-08-08 09:14:10 -07:00
Filippo Valsorda
0482038756 Enforce type of the XBlocks Fields when set 
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
 2014-08-08 09:14:10 -07:00
Nimisha Asthagiri
775b50a736 Address code coverage and quality. 2014-08-08 08:31:14 -04:00
Nimisha Asthagiri
934d4e8a23 Make Split Course work with new Publishing UI. 2014-08-07 20:23:44 -04:00
Nimisha Asthagiri
f10bcc1eb6 Fix get_courses. 2014-08-07 20:10:10 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL. 
Make default_store thread-safe.
 2014-08-07 18:07:41 -04:00