Commit Graph

14935 Commits

Author SHA1 Message Date
Michael Frey
c52ba6ac75 Revert "[SOL-1953] Update Commerce Configuration" 2016-09-21 15:33:02 -04:00
Brian Jacobel
86ce605115 Fix bottom-border of last discussion thread in list
TNL-5571
2016-09-19 10:50:00 -04:00
Christina Roberts
4288793a23 Merge pull request #13497 from edx/release
Merge release into master
2016-09-16 13:19:01 -04:00
Eric Fischer
c90186f802 Merge pull request #13494 from edx/efischer/skip_tests
Readd imports to fix broken tests
2016-09-16 12:14:15 -04:00
Sylvia Pearce
fba74adf76 Merge pull request #13490 from edx/sylvia/lms_help_fixes
LMS context sensitive help minor fixes
2016-09-16 09:59:09 -06:00
Sylvia Pearce
a448d74f6c Add more specific help links for four LMS pages 2016-09-16 09:07:22 -06:00
Nimisha Asthagiri
88297788b9 Merge pull request #13478 from edx/tnl/explicit-grade-values
Explicit grade values so saved grades are immune to subsection graded
2016-09-16 10:50:52 -04:00
Eric Fischer
d0ad808d39 Readd imports to fix broken tests 2016-09-16 10:21:04 -04:00
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
Nimisha Asthagiri
47e556c7f5 Use explicit 'graded' value so grades are immune to subsection's value
TNL-5560
2016-09-16 08:31:30 -04:00
wajeeha-khalid
7377634ea8 Merge pull request #13027 from edx/jia/MA-2139
MA-2139: Mark thread as read for learner on thread/comment creation
2016-09-16 13:57:09 +05:00
Eric Fischer
6d2468d0dc Merge pull request #13487 from edx/release
Hotfix 2016-09-15 release to master
2016-09-15 18:49:53 -04:00
Jareer Ahsan
118afcd37f ECOM-4945 Fixed Shift-Tab on menu
TNL-5437 Reverted to no RequireJS
2016-09-16 01:19:12 +05:00
Douglas Hall
e6b5cc9e41 Merge pull request #13485 from eduNEXT/edunext/fmo/unifying_helper_keys
Unifying calls to helper values
2016-09-15 15:11:22 -04:00
Felipe Montoya
0dda85d7f7 Fixing the call to the same value used in all other calls in the codebase 2016-09-15 11:58:24 -05: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
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
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
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
Chris Rodriguez
2e3129fbd8 AC-578 fixing link in label on logistration form 2016-09-14 14:59:14 -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
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
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
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
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
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