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

14968 Commits

Author SHA1 Message Date
alisan617
fb35ffb07d Merge pull request #13449 from edx/alisan/discussion-sidebar-topics-menu-TNL-5169 
Add aria attributes to discussion topics sidebar
 2016-09-22 17:48:57 -04:00
Ned Batchelder
358788255c Merge pull request #13546 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-22 17:12:47 -04:00
alisan617
0ffeb4639b Make the left sidebar in Discussion page accessible 
TNL-5169
 2016-09-22 15:28:29 -04:00
Eric Fischer
1b1bb94887 Merge pull request #13522 from edx/efischer/standardize_grades_logging 
Standardize logged errors
 2016-09-22 13:51:18 -04:00
Ned Batchelder
0a2e7363e7 Update translations (autogenerated message) 2016-09-22 17:35:44 +00:00
Nimisha Asthagiri
4202546158 Merge pull request #13533 from edx/beryl/integration-tests 
Grades python integration tests
 2016-09-22 13:24:37 -04:00
Andy Armstrong
810835700a Merge pull request #13527 from edx/release 
Release
 2016-09-22 13:05:33 -04:00
Nimisha Asthagiri
613652b74a Test: Rescoring problem updates grades accordingly 
TNL-5465
TNL-802
 2016-09-22 12:01:19 -04:00
Nimisha Asthagiri
e1f5e40f69 Test: Changing assignment weight changes course grade 
TNL-5465
 2016-09-22 11:58:41 -04:00
Eric Fischer
9b9ab2e44f Standardize logged errors 
For easier consumption by splunk, match the pattern used by other grades-
related log statements. Also, reduce the firehose of events being logged
in splunk.
 2016-09-22 11:53:12 -04:00
Asad Iqbal
0b7ec75a3f Merge pull request #13492 from edx/asadiqbal08/WL-603-edx 
WL-603 load locale paths for themes directories
 2016-09-22 16:28:19 +05:00
asadiqbal
2833d1e9a5 WL-603 load locale paths for themes directories 2016-09-22 13:26:11 +05:00
Michael Frey
c52ba6ac75 Revert "[SOL-1953] Update Commerce Configuration" 2016-09-21 15:33:02 -04:00
Chris
4f28b81fee Merge pull request #13334 from edx/clrux/ac-571-video-transcript-download 
AC-571 updating video download/transcript area
 2016-09-21 10:32:20 -04:00
Albert (AJ) St. Aubin
13d7ea46d5 Merge pull request #13524 from Stanford-Online/giulio/revert-ajax-fa-spinner 
Revert "Add fa loading spinner to CAPA problems"
 2016-09-21 07:54:13 -04:00
Giulio Gratta
0eca0eadaf Revert "Add fa loading spinner to CAPA problems" 
This reverts commit a3eb726f5f.
 2016-09-20 12:56:20 -07:00
Douglas Hall
2a0bdeb386 Merge pull request #13508 from edx/douglashal/HULL-103/provide_course_root_to_email_template 
HULL-103 Add the course root to the bulk email template context so that templa…
 2016-09-20 06:31:00 -04:00
Chris Rodriguez
0ebc90472c AC-571 updating video download/transcript area 2016-09-20 06:22:24 -04:00
wajeeha-khalid
eb11c6299d Merge pull request #13431 from edx/jia/MA-2663 
MA-2663: Donot mark thread unread on any action but creation
 2016-09-20 14:57:39 +05:00
Ned Batchelder
a7354c2d26 Merge pull request #13489 from juananpe/fixsysadmincourses 
Avoid to use an unsupported '/' operand between two unicode strings
 2016-09-19 17:28:23 -04:00
Juanan Pereira
d92e37337a Change fix following pullrequestreview-619682 2016-09-19 22:40:48 +02:00
Douglas Hall
4ac746a20b Add the course root to the bulk email template context so that templates can customize the full course URL with a custom hostname. 2016-09-19 15:34:55 -04:00
Brian Jacobel
86ce605115 Fix bottom-border of last discussion thread in list 
TNL-5571
 2016-09-19 10:50:00 -04:00
Marco Morales
49c79777aa Merge pull request #13424 from edx/marco/dashboard/card-cleanup 
Adjustments to course dashboard visual styles
 2016-09-19 10:21:47 -04:00
wajeeha-khalid
03f888b795 MA-2663: Donot mark thread unread on any action but creation 2016-09-19 19:16:23 +05:00
Brian Jacobel
a2bf4696e4 Merge pull request #13428 from edx/bjacobel/topic-list-dropdown 
Replace discussion topic selector with a native dropdown
 2016-09-19 09:53:17 -04:00
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
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
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
Juanan Pereira
8ad9bf4ff5 Avoid to use an unsupported '/' operand between two unicode strings 2016-09-15 23:15:41 +02: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