Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

523 Commits

Author SHA1 Message Date
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
uzairr
38cd616f06 Beta tester doesn't allow to earn cert 
If beta tester wants to earn a cert then they must
create a separate user account by using email and
username different from the account with beta tester
role.

PROD-491
 2019-08-21 16:24:00 +05:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Nimisha Asthagiri
d564af8301 Fix for decode errors in bulk_email.tests.test_course_optout.py 2019-08-19 14:26:48 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Syed Muhammad Dawoud Sheraz Ali
22d3f802f2 Revert "[BB-873] Support for filters, and multiple roots in problem response reports" 2019-08-09 17:17:36 +05:00
David Ormsbee
98deba6ec3 Merge pull request #19781 from open-craft/kshtij/problem-response-multi-root-and-fitler 
[BB-873] Support for filters, and multiple roots in problem response reports
 2019-08-08 13:36:43 -04:00
Kshitij Sobti
98af7496d7 Add support for generating problem response reports for multiple blocks, or filtered block types. 
This change adds support for specifying multiple root blocks while generating
problem response reports. It also allows specifying a block type filter so that
only blocks of the filtered types will be included in the report.

Finally, this change also consistenly uses absolute path for the location in the
report instead of relative paths.
 2019-08-08 15:02:46 +05:30
aarif
61800c619f replaced StringIO imports with import from six 
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
 2019-08-08 00:09:16 +05:00
Calen Pennington
1f028e0be3 Merge pull request #21269 from cpennington/requires-level-permissions 
Add a decorator that checks for course-level permissions
 2019-08-06 15:09:43 -04:00
Calen Pennington
0cd8f58bcc Remove all instances of from instructor import imports 2019-08-05 09:59:30 -04:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
noraiz-anwar
570cd673ef change task_input field's type from CharField to TextField 2019-07-23 17:21:03 +05:00
adeelehsan
72c5cb09e3 Merge pull request #20889 from edx/aehsan/INCR-471 
Python3 update
 2019-06-27 19:17:53 +05:00
uzairr
575589f8a5 Python-modernize on edx-platform (369 of 380) 2019-06-27 13:21:50 +05:00
adeelehsan
1b227232c5 Python3 update 
INCR-471
 2019-06-25 15:47:00 +05:00
amitvadhel
b6b1b0c602 INCR-473: Make compatible with Python 3.x 2019-06-23 13:29:43 +03:00
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