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

7462 Commits

Author SHA1 Message Date
Nimisha Asthagiri
663fbbbaa0 Merge pull request #13547 from edx/beryl/correct_weight 
Fix Problem grades that have weight values
 2016-09-27 12:24:12 -04:00
Nimisha Asthagiri
5ba77275d8 Fix problem weights in persisted grades 
TNL-5599
 2016-09-27 10:09:09 -04:00
Saleem Latif
af841336c7 Merge pull request #13549 from edx/saleem-latif/SOL-2080 
SOL-2080: Create a management command to add commerce configuration in lms
 2016-09-27 12:50:46 +05:00
Nimisha Asthagiri
6b4972e1d4 Merge pull request #13507 from edx/beryl/gating-grades 
Fix Gating to use grades API, instead of its own calculations
 2016-09-26 15:14:49 -04:00
Douglas Hall
d1a3af9460 Merge pull request #13526 from edx/douglashall/JER-157/allow_for_site_override_of_mktg_urls_setting 
JER-157 Allow for per-Site override of MKTG_URLS setting
 2016-09-26 14:01:36 -04:00
Jesse Shapiro
4360c50d6f Merge pull request #13252 from felipevolpone/master 
Disable the "View Unit in Studio" button in CCX courses
 2016-09-26 11:55:57 -04:00
Saleem Latif
f556035b22 Create a management command to add commerce configuration in lms 2016-09-26 17:08:10 +05:00
Nimisha Asthagiri
318121411a Fix Gating to use grades API, instead of its own calculations 
TNL-5062
 2016-09-24 00:46:28 -04:00
Nimisha Asthagiri
47e3c6d4a1 Merge pull request #13562 from edx/efischer/rm_dash_rf 
Remove offline grade calc
 2016-09-23 21:31:40 -04:00
Cliff Dyer
8930376bfb Merge pull request #13540 from edx/cdyer/visible-block-version 
Add version to VisibleBlocks model.
 2016-09-23 16:58:39 -04:00
Eric Fischer
8857b35b15 Remove offline grade calc 
This management command has been broken since before the django 1.8
upgrade, so I'm deleting it and all its tests, and updating a few
other files that used these methods but are easily refactored away.
 2016-09-23 16:43:10 -04:00
Douglas Hall
1d1952c8d3 Added SiteMixin for tests that need to test Site specific functionality 2016-09-23 15:57:08 -04:00
J. Cliff Dyer
37fc450b8b Add version to VisibleBlocks model. 
TNL-5600
 2016-09-23 13:52:30 -04:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02:00
Awais Jibran
45e243da5c Merge pull request #13480 from edx/aj/fix-password-rest-confirm 
Show error on password reset form
 2016-09-23 09:56:25 +05:00
Douglas Hall
8f6182aabf Allow for site override of MKTG_URLS setting in index view 2016-09-22 15:58:27 -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
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
Awais Jibran
3f21b0718f Show error message on password reset if provided passwords does not match. 2016-09-22 10:36:53 +05:00
Felipe Volpone
14f1fdf3c9 Disabling the "View Unit in Studio" button to CCX courses 2016-09-22 00:45:18 -03:00
Michael Frey
c52ba6ac75 Revert "[SOL-1953] Update Commerce Configuration" 2016-09-21 15:33:02 -04: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
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
wajeeha-khalid
03f888b795 MA-2663: Donot mark thread unread on any action but creation 2016-09-19 19:16:23 +05: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
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
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
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
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