Commit Graph

405 Commits

Author SHA1 Message Date
atesker
d88e41db46 updated header location, error handling 2019-05-22 15:51:36 -04:00
atesker
0bd94327fe killed rebase 2019-05-21 14:35:10 -04:00
Stu Young
c842b907b5 INCR-263 Run python-modernize on lms/djangoapps/instructor_task/config and lms/djangoapps/instructor_task/management (#20559)
* run python modernize

* run isort

* Fix quality
2019-05-21 11:31:43 -04:00
DawoudSheraz
9be988a12a added time logs for bulk email 2019-05-21 18:15:11 +05:00
Stu Young
3b65081fab incr-264 (#20575)
* run python modernize

* run isort

* quality fixes

* quality
2019-05-16 13:39:29 -04:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -04:00
Usman Khalid
41c6236e0a Convert CapaModule to ProblemBlock.
* Minimum possible changes were made to merge CapaModule & CapaDescriptor into
  one ProblemBlock class.
* There are no known changes in behavior.
* CapaModule and CapaDescriptor inherited from a number of classes which inherit
  from XModule or XModuleDescriptor but did not depend on them. For all these
  classes the methods were moved to mixins which did not inherit from either and
  then these mixins were added to ProblemBlock in the order which maintains MRO.
2019-05-01 20:08:36 +05:00
asadazam93
5a5c3fd79e Don't include invisible, graded subsections in grade reports. 2019-04-23 14:23:29 -04:00
Ned Batchelder
7d964b12db Context managers need to clean up properly
An @contextmanager will raise an exception from its yield statement if
an exception happens in the with-block that uses it.  If the context
manager needs to do clean up, it should do it even if an exception is
raised, so it needs to be done in a finally clause.
2019-04-17 13:14:48 -04:00
Matthew Piatetsky
62b9bb89c8 Change content_type_gating enabled_for_enrollment to return false if a course has no verified mode or a user is not enrolled in the audit mode 2019-04-14 16:32:13 -04:00
Kshitij Sobti
a76c6dca87 Fix issue with multiple responses for a single user returned by generate_report_data
Before this fix if an XBlock's generate_report_data method returned multiple
responses for the same user from a single user state, the report generator would
end up overwriting each response over the previous one such that only the last
response would be preserved.
2019-03-14 12:07:20 +05:30
Matthew Piatetsky
74bcc29417 Remove FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG 2019-03-07 15:46:33 -05:00
Matthew Piatetsky
49ae6b9d73 Remove CONTENT_TYPE_GATING flag 2019-03-07 15:46:33 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
Calen Pennington
8c53ce6493 Merge pull request #19743 from edx/unicode7
fix unicode strings in lms/ part 2
2019-02-13 14:15:02 -05:00
Matthew Piatetsky
764319d3e0 fix unicode strings in lms/ part 2 2019-02-13 10:35:56 -05:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
Diana Huang
6572d99e76 Remove all references to datadog from our code. 2019-01-08 15:41:24 -05:00
Bessie Steinberg
6f2a2785e8 REVE-154 FBE Global Kill Switch
Create a global kill switch for feature based enrollment.  To turn on
the kill switch (and turn off both course duration gating and content
type gating) enable a waffle flag named:
'content_type_gating.global_kill_switch'
2018-12-14 09:36:56 -05:00
Alex Dusenbery
305573ed8e Prefetch/cache subsection grades for gradebook. 2018-11-29 13:06:28 -05:00
Awais Jibran
4e98578f11 Workaround of CS50 OOM error
EDUCATOR-3483
2018-11-22 09:07:19 +05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Feanil Patel
4e13a1c2dd Revert "upgrade gunicorn 19.0 and make upgrade"
This reverts commit f6c215ae5b.
2018-10-31 15:01:00 -04:00
Nadeem Shahzad
eea6a0488c Merge pull request #19173 from edx/nadeem/OPS-3445
Upgrade gunicorn to 19.0 and make upgrade (OPS-3445)
2018-10-30 18:56:24 +05:00
nadeemshahzad
f6c215ae5b upgrade gunicorn 19.0 and make upgrade 2018-10-30 10:42:58 +00:00
Calen Pennington
f9dd7fe223 Allow Studio override of Feature Based Enrollment status for individual xblocks 2018-10-29 12:37:30 -04:00
Amir Qayyum Khan
9db5e83032 Fixed code duplication in task listing api on instructor dashboard 2018-10-11 12:28:21 +05:00
rabiaiftikhar
667bf488d9 EDUCATOR-3514 increase the length of task_input while creating instance of InstructorTask 2018-10-03 12:16:40 +05:00
Robert Raposa
71161b8eda Merge pull request #18879 from edx/revert-revert-18861-robrap/ARCH-223-replace-request-cache
ARCH-223: Revert the revert of Replace Request Cache
2018-09-08 16:30:37 -04:00
Robert Raposa
ba4cc62ff8 Retire deprecated RequestCache (Take 2)
ARCH-223
2018-09-08 15:09:28 -04:00
Alex Dusenbery
34199d9e98 Don't join to auth_user when getting verified user ids; use them in a set and not a list. 2018-09-07 11:59:46 -04:00
Nimisha Asthagiri
4ca165f690 Revert "ARCH-223: Retire deprecated RequestCache." 2018-08-30 16:33:03 -04:00
Robert Raposa
3df339a56a Retire deprecated RequestCache.
ARCH-223
2018-08-30 08:55:19 -04:00
Jeremy Bowman
d671c4b1d0 TE-2689 Remove useless pylint suppressions part 1 2018-08-13 17:01:21 -04:00
rabiaiftikhar
1f34924573 EDUCATOR-2120 allow Community TA to see all discussion posts regardless of cohort and enrollment track 2018-08-09 17:53:39 +05:00
Jeremy Bowman
ca3316962d TE-2524 Stop using nose.plugins - LMS 1 2018-07-31 13:03:18 -04:00
Kshitij Sobti
c7f980c9de Add correct answer to response 2018-07-09 23:57:14 +05:30
Kshitij Sobti
491532c2db Update report generation code to include old state for backwards compatibility
Include report data generated by blocks as columns instead of a json dict
2018-07-09 23:56:51 +05:30
irfanuddinahmad
a46a28e983 incorporated manual verification 2018-06-25 12:08:54 +05:00
Braden MacDonald
b12346f390 Merge pull request #18170 from open-craft/eugeny/instructor_report_popup_backend
Answers report: Return task ID and generated filename for frontend to consume
2018-06-18 13:26:27 -07:00
Eugeny Kolpakov
d058aacca9 Return task ID and generated filename from backend 2018-06-17 17:22:12 +08:00
Tyler Hallada
1f42d1b384 Merge pull request #18316 from edx/thallada/PLAT-1524-on-delete
PLAT-1524: Add on_delete kwarg to ForeignKey & OneToOneFields
2018-06-06 10:38:15 -04:00
Tyler Hallada
1540f9ec72 Add on_delete kwarg to ForeignKey & OneToOneFields
Django 2.0 will make this field required for `ForeignKey` and `OneToOneFields`.
In previous versions the option defaulted to `models.CASCADE` when not
specified. This change should make the deprecation warnings in the current
Django version go away.

The migrations where also modified, but the changes should not cause a change in
the database schema since `models.CASCADE` was already the old default.
2018-06-05 17:05:12 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
2018-06-05 13:59:09 -04:00
rabiaiftikhar
2760eeba6e EDUCATOR-2927 certificate eligible column will appear with value N for audit-passing learners in grade report 2018-05-30 14:28:51 +05:00
Kshitij Sobti
73179edd18 Adapt tests to work with the presence of generate_report_data
Add integrationish test
2018-05-25 19:19:53 +05:30
Kshitij Sobti
011b295890 Handle NotImplementedError raised by generate_report_data 2018-05-25 18:44:59 +05:30
Kshitij Sobti
7e01a065b9 Use `generate_report_data` for getting report data if the block provides it 2018-05-25 18:44:59 +05:30
Kshitij Sobti
ccabab0771 Added chapter blocks to be excluded from report 2018-05-25 18:44:59 +05:30
Kshitij Sobti
1aa55c6cfa Documentation grammar and accuracy fixes 2018-05-25 18:44:59 +05:30