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

38575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muddasser
dd876d8be1 Merge pull request #13312 from edx/muddasser/TNL-5315 
lms/navigation.feature to bokchoy
 2016-09-19 11:17:39 +05:00
Brian Jacobel
a1cc094313 Merge pull request #13457 from edx/bjacobel/discussion-color-contrast 
Fix color-contrast a11y failures in Discussions
 2016-09-16 15:49:55 -04:00
Christina Roberts
4288793a23 Merge pull request #13497 from edx/release 
Merge release into master
 2016-09-16 13:19:01 -04:00
Brian Jacobel
c28fc04b78 Commenting out color-contrast tests for DiscussionOpenClosedThreadTest because of Jenkins issues 2016-09-16 13:11:21 -04:00
Brian Jacobel
a229e1f028 Fix DiscussionHomePageTest color-contrast issues - TNL-4635 2016-09-16 13:11:21 -04:00
Brian Jacobel
a19274c84f Fix DiscussionOpenClosedThreadTest color-contrast issues - TNL-4644 2016-09-16 13:11:20 -04:00
Brian Jacobel
ad1aa2b35f Fix DiscussionTabMultipleThreadTest color-contrast issues - TNL-4639 2016-09-16 13:11:20 -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
Christina Roberts
c248417d20 Merge pull request #13493 from edx/hotfix/2016-09-16 
Revert modal dialog changes
 2016-09-16 11:46:54 -04: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
Andy Armstrong
8b8339b129 Merge pull request #11999 from raccoongang/kssl/show_location_id_xblock 
Show location in the settings xblock.
 2016-09-15 22:38:33 -04: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
jareerahsan
172a3be946 Merge pull request #13435 from edx/jareer/ECOM-4945-NoRequireJS 
ECOM 4945 Revert to No RequireJS
 2016-09-16 03:48:43 +05: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
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
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
sanfordstudent
134e764c7b Merge pull request #13447 from edx/sstudent/TNL-5466 
bok choy tests for persistent grades
 2016-09-15 14:22:38 -04:00
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
Sanford Student
bf1fcc68cd bok choy tests for persistent grades 2016-09-15 13:23:20 -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
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
Oksana Slusarenro
e3f55afc41 Changed "Location ID" to "Component Location ID" 2016-09-15 10:52:00 +03: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