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

38544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
bf47486bb0 Merge pull request #13464 from edx/robrap/TNL-5115 
TNL-5115: Remove sort order from Discussions in edx-platform
 2016-09-15 14:03:41 -04:00
Robert Raposa
f774ccf3f8 Remove support for sort_order (order_direction). 
- Default of "desc" is all that is in use, and remains as-is.
- Discussion API keeps order_direction param, to minimize changes,
but it only accepts "desc".
- Discussion webapp simply no longer sends in the sort order.
 2016-09-15 12:11:01 -04:00
David Baumgold
9d17d29ccf Merge pull request #13481 from singingwolfboy/update-pa11ycrawler 
pa11ycrawler 1.5.2
 2016-09-15 11:37:39 -04:00
David
1e6821d17f pa11ycrawler 1.5.2 2016-09-15 10:43:57 -04:00
Jesse Zoldak
5dc9ba7b42 Merge pull request #13479 from edx/revert-13470-update-pa11ycrawler 
Revert "pa11ycrawler 1.5.1"
 2016-09-15 10:26:14 -04:00
David Baumgold
face3dd1ff Revert "pa11ycrawler 1.5.1" 2016-09-15 10:02:43 -04:00
Robert Raposa
2abe3f7e01 Reuse already retrieved user object. 2016-09-15 09:52:34 -04:00
Ned Batchelder
726a59110f Merge pull request #13476 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-15 09:36:53 -04:00
Albert (AJ) St. Aubin
1586b88d8c Merge pull request #13224 from Stanford-Online/giulio/capa-loading-spinner-upstream 
Add font awesome loading spinner to CAPA problems
 2016-09-15 09:17:56 -04:00
David Baumgold
9691cf7db6 Merge pull request #13470 from singingwolfboy/update-pa11ycrawler 
pa11ycrawler 1.5.1
 2016-09-15 08:34:46 -04:00
Chris
23cc23bb9c Merge pull request #13386 from edx/clrux/ac-578-logistration-label-link 
AC-578 fixing link in label on logistration form
 2016-09-15 07:30:11 -04:00
Ned Batchelder
ab819d1273 Update translations (autogenerated message) 2016-09-15 11:27:16 +00:00
Giulio Gratta
a3eb726f5f Add font awesome loading spinner to CAPA problems 
- loading spinner is automatically replaced by the content when AJAX problem_get returns
 2016-09-14 14:58:35 -07:00
Christina Roberts
2afc986666 Merge pull request #13469 from edx/release 
Merge release back into master
 2016-09-14 17:11:53 -04:00
Eric Fischer
8887869a0c Merge pull request #13459 from edx/efischer/catchall 
Make Robust Grades Robust Again
 2016-09-14 16:43:10 -04:00
Jesse Zoldak
3ff060ce20 Merge pull request #13467 from edx/zoldak/coverage-42 
Update coverage version to 4.2
 2016-09-14 16:00:49 -04:00
David
65b1ba5157 pa11ycrawler 1.5.1 2016-09-14 15:34:17 -04:00
Chris Rodriguez
2e3129fbd8 AC-578 fixing link in label on logistration form 2016-09-14 14:59: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
Jesse Zoldak
c90d0d5f9a Update coverage version to 4.2 2016-09-14 13:57:59 -04:00
Nimisha Asthagiri
fe081136c2 Merge pull request #13440 from edx/tnl/progress-page-queries 
Reduce sql queries with persisted grades
 2016-09-14 13:06:35 -04:00
Eric Fischer
fd71afe94f Make Robust Grades Robust Again 
As part of the Robust Grades rollout, we expect to see some DatabaseErrors in
various methods that write to the database. Since the success of this write
operation is not needed for the end-user, we just log and swallow the error.

In the future, we'll also enqueue an async task to finish the write operation
that failed.
 2016-09-14 12:05:59 -04:00
Nimisha Asthagiri
232d99d06d Persisted grades optimization - update query counts in tests 2016-09-14 11:44:54 -04:00
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
cahrens
c7c8a4e500 Don't delete question p-tag if children. 
TNL-5510
 2016-09-14 09:45:24 -04:00
John Eskew
6fd8452d24 Merge pull request #13458 from edx/edx-django-release-util/0.1.1 
Change edx-django-release-util version.
 2016-09-13 17:02:18 -04:00
John Eskew
c205f9650c Merge pull request #13419 from edx/jeskew/opaque_keys_test 
Update opaque-keys and ccx-keys versions.
 2016-09-13 17:01:44 -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
John Eskew
9e07bb530c Bump edx-opaque-keys version to 0.3.4 2016-09-13 14:54:32 -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
John Eskew
2ea29145ae Updating edx-django-release-util requirement to version 0.1.1 2016-09-13 13:53:27 -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