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

1724 Commits

Author SHA1 Message Date
David Baumgold
b4d14a566e Merge pull request #4892 from edx/db/marcnu-quality 
Cleaning up a few quality violations
 2014-08-19 14:42:40 -04:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support 
Microsites alongside Theme
 2014-08-19 12:39:21 -04:00
David Baumgold
fb0ee690f2 Cleaning up a few quality violations 2014-08-19 11:49:43 -04:00
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
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
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
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
Adam
c830537ea3 Merge pull request #4844 from edx/release 
Release
 2014-08-14 17:06:39 -04:00
Adam
0edac1540d Merge pull request #4833 from edx/waheed/hotfix/2014-08-12 
Check REQUEST_CONTEXT.context exists before accessing it.
 2014-08-14 12:53:09 -04:00
Waheed Ahmed
d9ccaa650a Check REQUEST_CONTEXT.context exists before accessing it. 
LMS-11226
 2014-08-14 12:21:54 -04:00
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00
Julia Hansbrough
2204eb7390 Fixed merge conflict between release and master. 2014-08-13 18:11:30 +00:00
Diana Huang
d60907d725 Consider profession ed courses as paid courses. 
ECOM-63
 2014-08-12 18:45:22 +00:00
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode. 
ECOM-41
 2014-08-12 18:44:46 +00:00
Julia Hansbrough
805c325653 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-12 18:44:40 +00:00
Jesse Zoldak
f59dd647c5 Capture console log on lettuce test failure 2014-08-11 14:39:22 -04:00
Muhammad Ammar
936bd4d5ad Bok-Choy CMS Video Tests 2014-08-11 07:50:19 +00:00
Julia Hansbrough
b9a285f1e7 Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button 
Redirect to show_reqs for prof ed
 2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-08 21:02:16 +00: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
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
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
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes 
Split/add and fixes
 2014-08-08 14:12:02 -04:00
Usman Khalid
131c8cbf10 Catch InvalidKeyError in course_id_from_url(). 
LMS-9663
 2014-08-08 18:21:48 +05: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
Nimisha Asthagiri
ec3011635d LMS-11179 Fix Assets with Split 2014-08-07 17:59:38 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Diana Huang
0d62895be4 Modify certificates_show_before_end_date behavior 
Hide the certificate notification box when there's
no certificate information, even when the flag
certificates_show_before_end_date is turned on.

ECOM-11
 2014-08-07 14:58:04 -04:00
Tim Babych
8d0e469cd3 Remove code and template responsible for subsection edit page 2014-08-07 12:27:25 -04:00
Andy Armstrong
f061bbc08b Backbone version of the course outline page 
STUD-1726
 2014-08-07 12:16:20 -04:00
Andy Armstrong
b1eccdf2d4 Replace unit page with the container page. 
STUD-1754
 2014-08-07 12:16:17 -04:00
Usman Khalid
46b1c850f8 Catch InvalidKeyError in UserTagsEventContextMiddleware. 
LMS-11189
 2014-08-07 15:41:07 +05:00
Jim Abramson
fdca788845 Merge pull request #4719 from edx/waheed/lms6622-implemented-process-response-method-rc 
Implemented process_response method to clear requestcontext global variable in mako middleware.
 2014-08-06 11:41:48 -04:00
Alexander Kryklia
16601d5405 Request IFRAME API every time with https scheme. 2014-08-06 11:13:26 -04:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware. 
LMS-6622
 2014-08-06 19:58:20 +05:00
Alexander Kryklia
c9ef2f3efa Request IFRAME API every time with https scheme. 2014-08-06 14:59:17 +03:00
Don Mitchell
753c67a73a Merge pull request #4698 from mitocw/cg/fix_student_migration_35 
Correct UnboundLocalError exception in student_migration_35
 2014-08-05 18:26:45 -04:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes 
eCommerce enhancements (pt. 2)
 2014-08-05 13:12:52 -04:00
Carson Gee
7bb780335d Correct UnboundLocalError exception in student_migration_35 2014-08-05 11:51:49 -04:00
polesye
4f391f664d Update youtube api. 2014-08-05 18:27:55 +03:00
Chris Dodge
a1248f614e add more detail to new CourseModesArchive table 2014-08-05 10:00:17 -04:00
asadiqbal08
932010df59 refund message for purchased courses 
Add little more logic for paid courses
 2014-08-05 10:00:16 -04:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality 
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
 2014-08-05 10:00:13 -04:00
Diana Huang
ec13aabe97 Fix up tests and enrollment behavior. 2014-08-05 09:32:39 -04:00
Diana Huang
52f9613274 Add an optional description field to course modes. 2014-08-05 09:32:39 -04:00
Diana Huang
3d942503c2 Add the ability to override non-standard verified mode names 2014-08-05 09:32:39 -04:00
Diana Huang
604bfabb88 fixup! Allow verified to be offered without audit 2014-08-05 09:32:39 -04:00
Diana Huang
cfc3b46c5c Allow verified to be offered without audit 2014-08-05 09:32:38 -04:00
Muhammad Ammar
acc8616d0c Fix Video Player Initialisation Issue 2014-08-05 14:04:31 +03:00