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

38515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Cliff Dyer
29034df3bb VisibleBlocks migration: add course_id for bulk retrieval 2016-09-14 11:44:53 -04:00
Nimisha Asthagiri
4dbbe513be Reduce sql queries with persisted grades 
TNL-5458
TNL-5493
 2016-09-14 11:44:53 -04:00
Douglas Hall
bc966f0e40 Merge pull request #13460 from edx/release 
Merging hotfix/2016-09-13 release into master
 2016-09-13 16:13:16 -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
Brian Jacobel
c1cf5469cd Merge pull request #13450 from edx/bjacobel/forum-header-aria-label 
Wrap the discussion header in a <nav aria-label="Forums">
 2016-09-13 14:06:30 -04:00
Brian Jacobel
11004e6386 Wrap the discussion header in a <nav aria-label="Forums"> 
TNL-5193
 2016-09-13 12:49:16 -04:00
Robert Raposa
3e0bd55c97 Merge pull request #13445 from edx/robrap/TNL-5240 
TNL-5240: Cache comment thread.
 2016-09-13 11:53:23 -04:00
Chris
4b9ab31971 Merge pull request #13438 from edx/clrux/ac-581-dashboard-contrast 
AC-581 using UXPL values for course types on dashboard
 2016-09-13 10:27:34 -04:00
Renzo Lucioni
ba1df07ff1 Merge pull request #13448 from edx/release 
Merge release into master
 2016-09-13 10:02:07 -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
Nimisha Asthagiri
cca19c321e Merge pull request #13442 from edx/tnl/enrollment_queries_cache 
Cache Enrollment state for (user, course) in request cache
 2016-09-12 16:46:36 -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
Nimisha Asthagiri
5822919549 Cache Enrollment state for (user, course) in request cache. 2016-09-12 15:56:03 -04:00
Andy Armstrong
49fe0d35eb Merge pull request #13416 from edx/andya/fix-discussion-rtl 
Fix RTL issues with discussion sass
 2016-09-12 14:58:01 -04:00
sanfordstudent
c920269b6c Merge pull request #13407 from edx/sstudent/TNL-5398 
logging
 2016-09-12 13:55:43 -04:00
Nimisha Asthagiri
31409940ad Merge pull request #13433 from edx/tnl/enable-persistent-grades-in-tests 
Enable Persistent Grades in unit tests
 2016-09-12 13:46:51 -04:00
Andy Armstrong
a6bbe8a3a2 Fix RTL issues with discussion sass 
TNL-4709
 2016-09-12 13:38:50 -04:00
Robert Raposa
435905101c Cache comment thread. 2016-09-12 12:10:03 -04:00
Sanford Student
c48996c0fc logging for persistent grades rollout 2016-09-12 12:02:44 -04:00
Brian Jacobel
a5376cd4d0 Merge pull request #13425 from edx/bjacobel/topic-list-corners 
Fix extremely minor box corner issue in Discussions
 2016-09-12 12:00:04 -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
Matjaz Gregoric
cfe855f121 Merge pull request #12832 from open-craft/mtyaka/ccx-discussions 
Enable discussion forums on CCX courses.
 2016-09-12 11:51:05 +02:00
Matjaz Gregoric
8dc84bec3a Enable discussions on CCX courses. 
Discussion is restricted to the CCX course (there is no sharing of
discussions with the parent course or other CCX instances).
 2016-09-12 09:51:05 +02:00
Nimisha Asthagiri
805bf28748 Disable persistent-grades for tests failing query counts, until TNL-5458 2016-09-11 12:32:43 -04:00
Nimisha Asthagiri
c1d4d730e0 Fix submissions API test - now that calculated grades are saved 2016-09-11 00:45:50 -04:00
Nimisha Asthagiri
d244715e87 Don't sort blocks to retain order. 2016-09-10 13:29:58 -04:00
Nimisha Asthagiri
660bc8f447 Enable Persistent Grades in unit tests 2016-09-09 19:05:04 -04:00
Nimisha Asthagiri
2251097c56 Merge pull request #13437 from edx/cdyer/keep-course-run 
Ensure usage keys have course run in locators.
 2016-09-09 19:02:31 -04:00
J. Cliff Dyer
ddd58dafd8 Ensure usage keys have course run in locators. 
TNL-5475
 2016-09-09 17:42:51 -04:00
Nimisha Asthagiri
0853e485fd Merge pull request #13429 from edx/tnl/progress-sql-queries 
Optimize Subsection Grades update
 2016-09-09 15:09:54 -04:00
Chris Rodriguez
ae4e4c1346 AC-581 using UXPL values for course types on dashboard 2016-09-09 15:04:59 -04:00
Nimisha Asthagiri
f0f7a5389b Optimize Subsection computation 2016-09-09 13:57:51 -04:00
Robert Raposa
2d9e38ca4c Merge pull request #13436 from edx/robrap/TNL-5457 
TNL-5457: Performance enhancements for Discussions API.
 2016-09-09 13:50:44 -04:00
Robert Raposa
bced90d2ee Performance enhancements for Discussions API. 
- Default to with_responses=False, except when required.
- Clean up search call unused params.
 2016-09-09 11:42:51 -04:00
Brian Jacobel
500bac6fcb Merge pull request #13427 from edx/bjacobel/load-more-button 
Fix width of 'Load More' button in Discussions
 2016-09-09 11:38:10 -04:00
Tim Krones
df4a5df595 Merge pull request #13414 from open-craft/itsjeyd/update-xblock-poll 
Update xblock-poll dependency to v1.2.
 2016-09-09 16:15:58 +02:00
Brian Jacobel
2e0b6c1282 Merge pull request #13418 from edx/bjacobel/new-post-bug 
Fix bug where new posts were not assigned a topic ID and would fail to post
 2016-09-09 09:32:23 -04:00
Brian Jacobel
c54a5ee20c Fix width of 'Load More' button in Discussions 2016-09-08 16:53:23 -04:00
Cliff Dyer
6aaf442d2f Merge pull request #13324 from edx/efischer/grades_r_broke 
Persistent Grade being saved for individual problems
 2016-09-08 16:20:08 -04:00
Eric Fischer
31953c5e0c Update correct persistent score 
* First take at forcing a subsection's grade to update when a signal is
  sent that a problem's score has changed
* Refactor signal handler connection.
* Expand bokchoy tests to cover progress page
* Add some grading unit tests

TNL-5394
TNL-5364
 2016-09-08 15:09:05 -04:00
Brian Jacobel
dfeab6347d Fix extremely minor box corner issue in Discussions 2016-09-08 14:05:21 -04:00
PaulWattenberger
b0885bd4a5 Merge pull request #13409 from edx/pwattenberger/sailthru_campaign_id 
Pass Sailthru campaign id cookie to ecommerce
 2016-09-08 13:32:05 -04:00
Jesse Shapiro
05c8fa82cb Merge pull request #13360 from open-craft/haikuginger/sso-visible-field 
[ENT-13] Make SSO providers optionally hidden
 2016-09-08 13:11:51 -04:00
Brian Jacobel
545ef583e7 Fix bug where new posts were not assigned a topic ID and would fail to post 
TNL-5442
 2016-09-08 12:52:04 -04:00
Jesse Shapiro
ce2ab5b15c Adding 'visible' field for SSO providers 2016-09-08 11:27:09 -04:00
Robert Raposa
6f0e097115 Merge pull request #13421 from edx/TNL-5404 
TNL-5404: Default to not requesting responses when grabbing a single thread.
 2016-09-08 11:01:58 -04:00
PaulWattenberger
7ec898298e Pass Sailthru campaign id cookie to ecommerce 2016-09-08 10:50:13 -04:00
Renzo Lucioni
948c1bd8ae Merge pull request #13408 from edx/renzo/display-catalog-micromasters 
Retrieve marketable MicroMasters from the catalog service
 2016-09-08 09:47:20 -04:00
Mushtaq Ali
3c16225496 Merge pull request #13411 from edx/mushtaq/a11y-discussions-duplicate-id 
Remove duplicate-id rule for a11y discussions
 2016-09-08 18:33:13 +05:00
Peter Desjardins
99a61f1546 Merge pull request #13410 from edx/pdesjardins/DOC-2748 
Complete the LMS help link - add it to edx.org theme, adjust Sass styling for the theme and for pattern library pages
 2016-09-08 09:03:17 -04:00