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

38433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
a249e8e18c Revert "Fixed keyboard focus remains within modal simulated dialogs." 
This reverts commit 3c84b7a12c.
 2016-09-16 09:27:34 -04:00
cahrens
9804f73e36 Revert "Fixed focus should remain within the simulated dialogs." 
This reverts commit ae849406bf.
 2016-09-16 09:27:19 -04:00
Eric Fischer
1b6afb0b25 Merge pull request #13482 from edx/hotfix/2016-09-15 
Fix grade push back for non-components through LTI
 2016-09-15 15:51:24 -04:00
Pan Luo
89750172b4 Fix grade push back for non-components through LTI 
There is a bug introduced in this commit:
22046d4067 (diff-32687833c38e231b51a8f27a76c72a56R119)
The return value of the locations_to_weighted_scores[location] is
changed from `Score` object to a tuple (Score, weight). However, the
left side of assignment didn't get updated. So an error is raised and
the Celery task failed to continue. Thus, no grade is being passed back.
 2016-09-15 12:14:14 -04:00
Christina Roberts
f13f05b3fc Merge pull request #13466 from edx/hotfix/2016-09-14 
Don't delete question p-tag if children.
 2016-09-14 14:41:50 -04:00
cahrens
c7c8a4e500 Don't delete question p-tag if children. 
TNL-5510
 2016-09-14 09:45:24 -04:00
Douglas Hall
939a3d2098 Merge pull request #13454 from edx/hotfix/2016-09-13 
Fix the duplicate oauth_body_hash in the outcomes request
 2016-09-13 15:11:43 -04:00
Pan Luo
18648b52fc Fix the duplicate oauth_body_hash in the outcomes request 
The "oauth_body_hash" appeared twice in the auth header in the request
when posting grade back to tool consumer. However, the signature sent
from edX is calculated based on only one oauth_body_hash.
On the tool consumer side, the signature is calculated based on the auth
header and will use the duplicated fields. So the signatures will not match.
And request will fail the signature validation.

The bug was introduced in this commit:
03cee389e0
on July 12th by updating the oauthlib.

Because 0.7.2(original version) doesn't have oauth_body_hash support, so a custom
OAuth1 client was implemented to add oauth_body_hash to the headers:
f5d0f3ff55/lms/djangoapps/lti_provider/outcomes.py (L24).
However, the new oauthlib 1.0.3 has support for oauth_body_hash
(51675237c4 (diff-c2a1e5f1ddfe8e48ff62b59eb952644eR180)).
So after updating library, oauth_body_hash is added twice.

This fixes the bug by removing the custom client and use the oauthlib
default client to generate the auth header.
 2016-09-13 09:33:07 -04:00
Renzo Lucioni
c70ebfbb39 Merge pull request #13446 from edx/patch/2016-09-12 
patch/2016-09-12
 2016-09-12 16:31:13 -04:00
Renzo Lucioni
066e7e8c36 Retrieve marketable MicroMasters from the catalog service 
Catalog-based MicroMasters need to be displayed in the LMS. However, the LMS currently retrieves all program data from the soon-to-be-retired programs service. Consuming program data exclusively from the catalog service is out of the question right now; it's too complex to confidently pull off in a week. This is a functional middle ground introduced by ECOM-5460. Cleaning up this debt is tracked by ECOM-4418.
 2016-09-12 11:01:30 -04:00
Matt Drayer
5227d86154 Merge pull request #13396 from edx/rc/2016-09-06 
Release Candidate rc/2016-09-06
 2016-09-07 08:08:33 -04:00
Muhammad Ammar
cf9db7ee0d Merge pull request #13402 from edx/ammar/update-label-extract-logic 
update question tag extraction logic
 2016-09-06 17:20:07 +05:00
muhammad-ammar
d85cdcace2 update question tag extraction logic 2016-09-06 16:35:34 +05:00
jareerahsan
c5de73a710 Merge pull request #13401 from edx/jareer/ECOM-4945-Fix 
Fixed div to inline
 2016-09-06 12:45:11 +05:00
Jareer Ahsan
e680dfbc7a Fixed div to inline 2016-09-05 17:50:48 +05:00
Clinton Blackburn
40110b3171 Revert "Updated User Info Cookie" 2016-09-02 17:28:34 -04:00
Muzaffar yousaf
d97e8e5e7e Merge pull request #13397 from edx/ammar/poc 
Making CAPA problems accessible TNL-4971
 2016-09-03 01:06:48 +05:00
Ehtesham
1b960e3e17 requiring codemirror compressed with all addons included 2016-09-02 21:40:20 +05:00
Douglas Hall
83e780e48f Merge pull request #13393 from edx/ibrahimahmed443/MAYN-314-survey-template-fix 
safe template escaping of the mailto link in the survey template
 2016-09-02 10:51:58 -04:00
muhammad-ammar
f91583c24c make responsetypes with multiple inputtypes accessible 2016-09-02 19:44:25 +05:00
muhammad-ammar
19cc68c8c3 make numerical and math expression input accessible 
TNL-4973
 2016-09-02 19:44:24 +05:00
Ehtesham
31be6fad43 make CAPA dropdown problems accessible 2016-09-02 19:44:24 +05:00
muhammad-ammar
e1a595d88a make textinput accessible 
TNL-4972
 2016-09-02 19:44:23 +05:00
muhammad-ammar
7240b6256c Associate descriptions with question text 
TNL-5014
 2016-09-02 19:44:22 +05:00
Ehtesham
3556f2a3ea make CAPA problems (MultipleChoice and Checkboxes) accessible 2016-09-02 19:44:22 +05:00
muhammad-ammar
d14928cc61 separation based on responsetypes poc 
FEDX-176
 2016-09-02 19:44:22 +05:00
Eugeny Kolpakov
2fcc463338 Merge pull request #13389 from open-craft/ekolpakov/drag_and_drop_v2_hash_update 
Dependency version update: Drag and Drop  v2.0.9
 2016-09-02 17:32:13 +03:00
Douglas Hall
43580bc573 Merge pull request #13358 from edx/saleem-latif/MAYN-207-transition-to-theming 
MAYN-207: Migrate WL sites to comprehensive theming for LMS
 2016-09-02 10:21:21 -04:00
Ibrahim
acf4c94c49 safe template escaping of the mailto link in the survey template 2016-09-02 09:22:45 -04:00
Nimisha Asthagiri
b8f465d788 Merge pull request #13388 from edx/tnl/bstructure-delay-retry-task 
Make BlockStructure tasks more resilient against failures
 2016-09-02 09:02:17 -04:00
Nimisha Asthagiri
c7c609041b Merge pull request #13384 from edx/ormsbee/csm_nl_fix_2 
Script to remove course_ids with \n from CSM
 2016-09-02 09:01:45 -04:00
E. Kolpakov
23c13c1833 Dependency version update: Drag and Drop v2.0.9 2016-09-02 15:48:01 +03:00
Adam
e1cd58dcd4 Merge pull request #13385 from edx/release 
Release
 2016-09-02 08:41:17 -04:00
Nimisha Asthagiri
b37d2d739a Make BlockStructure tasks more resilient against failures. 
https://openedx.atlassian.net/browse/TNL-5041
 2016-09-02 08:02:49 -04:00
Douglas Hall
c03026c5ee Merge pull request #13374 from edx/douglashall/WL-589/site_cache_timeout 
WIP WL-589 Upgrade to edx-django-sites-extensions 2.1.0
 2016-09-02 06:26:22 -04:00
David Ormsbee
75f9a522dc Script to remove course_ids with \n from CSM 
Some StudentModule entries were written with newlines at the end of the
course_id. This script finds those entries within a given time range,
archive them, and merges records if necessary (capa problems).
 2016-09-01 22:28:06 -04:00
Douglas Hall
b620f07084 Upgrade to edx-django-sites-extensions 2.1.0 to take advantage of site cache timeout 2016-09-01 16:38:41 -04:00
Ned Batchelder
2932023a51 Merge pull request #13375 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-01 15:16:55 -04:00
Adam
b3d29fd425 Merge pull request #13380 from edx/hotfix/tnl-5410 
Handle scoreable blocks without defined weight
 2016-09-01 14:17:59 -04:00
Peter Desjardins
b525fe0eac Merge pull request #13215 from edx/pdesjardins/DOC-2748 
Add a help link to the LMS header - and configuration to select Open edX or edX partner doc
 2016-09-01 13:43:19 -04:00
J. Cliff Dyer
6bda334b99 Handle scoreable blocks without defined weight 
Default weight to 1.0.

TNL-5410
 2016-09-01 15:56:17 +00:00
Peter Desjardins
e276ae2d36 Adds a context-sensitive link to learner documentation from the LMS. The base URL defaults to Open edX learner doc and can be overridden with the base URL for edx.org learner doc. Also relabels the tab for support from help to support. 2016-09-01 10:56:09 -04:00
Ned Batchelder
caa7b472b9 Update translations (autogenerated message) 2016-09-01 11:24:52 +00:00
Saleem Latif
f974347dcb Update theming to have priority over microsites. 2016-09-01 14:57:52 +05:00
Clinton Blackburn
33ae93ec5b Merge pull request #13321 from edx/clintonb/userinfo-cookie 
Updated User Info Cookie
 2016-08-31 21:31:44 -04:00
George Song
7ba9048a39 Merge pull request #13371 from edx/george/disable-ddt-profile-panel 
Disable debug-toolbar ProfilingPanel
 2016-08-31 17:14:03 -07:00
Clinton Blackburn
33636db966 Updating user info cookie when user loads the dashboard 
Updating this cookie here helps ensure the marketing site has the most up-to-date enrollment details.

ECOM-4895
 2016-08-31 19:40:00 -04:00
Clinton Blackburn
09f7b6145f Updated logon user info cookie 
- Cookie now includes users' enrollment info
- Removed user email address from cookie
- Refactored functions so that we can update this cookie on other pages
- Added six to ensure new code is compatible with Python 3.x

ECOM-4896
 2016-08-31 19:40:00 -04:00
Clinton Blackburn
2159b71870 Factory Cleanup 
- Corrected import ordering
- Using a constant for the User password

ECOM-4896
 2016-08-31 19:40:00 -04:00
George Song
5811b92e6e Disable debug-toolbar ProfilingPanel 
There's a [bug](https://github.com/jazzband/django-debug-toolbar/issues/792)
that prevents wrapped views from working properly with the profiling panel.

Disable it by default.
 2016-08-31 13:38:28 -07:00