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

25849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usman Khalid
ec508f591c StaticContentServer middleware conforms closer to spec for byte range requests. 
This commit makes the following changes:
1. If there are syntactic errors in the Range header, it is ignored and
the full content is returned. This conforms to the spec.
2. In case of multiple ranges in the header, the full content is returned.
This behavior differs from the spec which says that a multipart response
should be returned.

PLAT-104
 2014-09-23 21:36:45 +05:00
Jason Bau
83c54d4e6e Merge pull request #5048 from Stanford-Online/jbau/edx/custom-response-fractional-grades 
capa custom response support for decimal grades
 2014-09-23 06:49:13 -07:00
clytwynec
1e6084b960 Merge pull request #5331 from edx/clytwynec/disable_flaky_video_times_test 
disabling test_video_start_time_and_end_time
 2014-09-23 09:23:26 -04:00
Christine Lytwynec
2887121390 disabling test_video_start_time_and_end_time 2014-09-23 09:15:58 -04:00
Carlos Andrés Rocha
874c338175 Merge pull request #5316 from rocha/use-default-locale-in-openid-claim 
Use default locale to OpenID profile claims.
 2014-09-22 17:36:26 -04:00
Carlos Andrés Rocha
c35f4bf794 Merge pull request #5314 from rocha/configurable-oauth-enforce-secure 
Allow SSL enforcement for OAuth2 provider to be configurable
 2014-09-22 17:35:43 -04:00
Jason Bau
637f55414f capa custom response support for decimal grades 2014-09-22 13:27:46 -07:00
Carlos Andrés Rocha
5500cc6816 Use default locale to OpenID profile claims. 
If the user has not selected a default locale, then return the default one.
 2014-09-22 15:19:40 -04:00
Carlos Andrés Rocha
e04c6c2a48 Merge pull request #5315 from rocha/fix-fullname-in-oauth2-handler 
Return OpenID Connect user name from user profile.
 2014-09-22 15:14:15 -04:00
Mark Hoeber
c9357985a2 Merge pull request #5318 from edx/markhoeber-doc936 
Content experiments update
 2014-09-22 13:51:17 -04:00
Adam
ef525f288f Merge pull request #5295 from edx/adam/add-simple-help-modal-test 
add simple help-modal-test
 2014-09-22 13:17:47 -04:00
Mark Hoeber
7889585c48 Content experiments update 
comments from Anant
 2014-09-22 13:06:00 -04:00
Carlos Andrés Rocha
19f95f0053 Return OpenID Connect user name from user profile. 2014-09-22 11:34:10 -04:00
Carlos Andrés Rocha
37d604a90f Allow SSL enforcement for OAuth2 provider to be configurable 2014-09-22 10:47:20 -04:00
Adam Palay
5fa38cb59e add simple help-modal-test 2014-09-22 09:34:32 -04:00
Waheed Ahmed
03d9a6fd29 Merge pull request #5277 from edx/waheed/tnl413-fix-course-id-kwarg-on-merge-wiki 
Fixed wiki merge url regex.
 2014-09-22 16:22:53 +05:00
Waheed Ahmed
3e64faeaa3 Fixed wiki merge url regex. 
TNL-413
 2014-09-22 15:41:19 +05:00
Waheed Ahmed
f827c538fc Merge pull request #4460 from edx/waheed/lms6617-disable-student-view-if-course-is-not-released 
Disabled student view if course is not yet released for students.
 2014-09-22 13:25:58 +05:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students. 
LMS-6617
 2014-09-22 12:50:46 +05:00
John Eskew
4aa2dc5289 Merge pull request #5302 from edx/release 
Release merge - post hotfix-2014-09-19-1
 2014-09-19 14:31:16 -04:00
John Eskew
81d8c40e32 Merge pull request #5281 from edx/adam/hide-tabs-if-not-enrolled-rebase-2 
Deployed as hotfix
 2014-09-19 13:16:01 -04:00
Renzo Lucioni
135ce24977 Merge pull request #5248 from edx/renzo/cleanup-translated-strings 
Clean up translated strings in registration page, dashboard, and track selection flow
 2014-09-19 12:57:39 -04:00
srpearce
afc07cdac2 Merge pull request #5284 from edx/sylvia/docs/DOC-866 
Sylvia/docs/doc 866
 2014-09-19 11:00:35 -04:00
Sylvia Pearce
e00fa34fbb Added note about video URLs hidden by default 2014-09-19 10:59:51 -04:00
Clinton Blackburn
a5237a858e Merge pull request #5188 from edx/insights-staff-only 
Hiding Insights link for non-staff users
 2014-09-19 10:51:19 -04:00
Clinton Blackburn
8705694743 Hiding Insights link for non-staff users 2014-09-19 10:47:54 -04:00
Piotr Mitros
4d640ee7e3 Merge pull request #4898 from edx/danielli/recommender_pyfs 
RecommenderXBlock with pyfs, better UX, and modification of logging
 2014-09-19 10:40:06 -04:00
Adam Palay
0a385544a3 update number of queries in embargo test 2014-09-19 10:19:23 -04:00
Adam Palay
ac862b7a97 only load tabs if user is enrolled in course (TNL-286) 
add tests for static tabs
 2014-09-19 10:19:23 -04:00
swdanielli
165b015fe0 move to s3fs and handle one time url 2014-09-19 09:39:17 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets 
Python zip file importable from an asset
 2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets 
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
 2014-09-18 17:59:12 -04:00
srpearce
c2c65c5db1 Merge pull request #5287 from edx/sylvia/docs/relnotes918revision 
Correct name of video option
 2014-09-18 16:11:16 -04:00
Sylvia Pearce
586d3ba45d Correct name of video option 2014-09-18 16:10:34 -04:00
David Baumgold
6325206d49 Merge pull request #4697 from edx/db/update-multiple-deps 
Upgrade scipy, lxml, boto, edx-ora2
 2014-09-18 15:16:04 -04:00
Ben Patterson
9f573f3413 Merge pull request #5282 from edx/benp/js-test-timeouts 
Disable flaky javascript tests TE-485
 2014-09-18 14:45:26 -04:00
Ben Patterson
c875f71573 Disable flaky javascript tests TL-439 2014-09-18 14:43:57 -04:00
David Baumgold
649288fc68 Update ora2 and submissions 2014-09-18 14:04:31 -04:00
John Eskew
9e830d08c4 Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. 2014-09-18 12:27:32 -04:00
Waheed Ahmed
22785e96fc Merge pull request #5258 from edx/waheed/tnl265-fix-fullscreen-functionality 
Fixed full screen functionality for image module in HTMLModule.
 2014-09-18 21:22:25 +05:00
srpearce
1d6d0f8006 Merge pull request #5268 from edx/sylvia/docs/relnotes_9_18 
Draft of 9-18 release notes
 2014-09-18 12:11:42 -04:00
Sylvia Pearce
d8e31da5f6 Release notes for September 18 2014-09-18 12:09:16 -04:00
Adam Palay
1b06edb6ff display banner on course info page if user is not enrolled (TNL-286) 
write failing tests for info page banner
 2014-09-18 11:35:18 -04:00
Adam Palay
e569e090c2 redirect users from about page to info page when there is a marketing site (TNL-286) 2014-09-18 11:35:17 -04:00
Adam Palay
7f4da14185 Add middleware optionally to catch unenrolled students who fail has_access (TNL-286) 2014-09-18 11:35:17 -04:00
Sarina Canelake
59820f811a Merge pull request #5271 from jazkarta/edx-jsme-1.0.1 
Upgrade edx-jsme to the latest version.
 2014-09-18 10:24:01 -04:00
Sarina Canelake
196bb3de6b Merge pull request #5275 from stvstnfrd/dashboard/analytics/hr 
Move <HR> inside of template conditional
 2014-09-18 10:12:57 -04:00
Waheed Ahmed
ef0af6e9d5 Fixed full screen functionality for image module in HTMLModule. 
TNL-265
 2014-09-18 19:00:44 +05:00
Sarina Canelake
3f23ce83b7 Update public_sandboxes.rst 2014-09-18 09:20:06 -04:00
Alison Hodges
7f492aa04f Merge pull request #5180 from edx/ahodges/doc/DOC-909 
Country and City fields in auth_userprofile
 2014-09-18 09:06:08 -04:00