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

19807 Commits

Author SHA1 Message Date
Feanil Patel
e66a7a90e5 Byte string doesn't have a format function in python 3 2019-08-12 14:34:52 -04:00
Dave St.Germain
05375b40fa Merge pull request #21318 from edx/dcs/missing-when 
Added edx-when's FieldData
 2019-08-12 12:41:51 -04:00
Dave St.Germain
267be29ab7 Added edx-when's FieldData 
EDUCATOR-4554
This fixes a bug where extended due dates were visible in the outline but not reflected on the courseware pages, resulting in problems not being submittable past the due date.
In order for edx-when to work on courseware pages, it has to be more careful about field inheritance, which version 0.2 achieves.
 2019-08-12 11:05:44 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85 
BOM-85
 2019-08-12 10:01:07 -04:00
arbisoft
9b87cb0172 BOM-85 
he builtin basestring abstract type was removed. Use str instead.
 2019-08-09 22:08:57 +05:00
Alex Dusenbery
fd539e4001 Don't jam LOGIN_REDIRECT_WHITELIST into devstack_docker settings, we already define it in devstack (and we read private.py from devstack). 2019-08-09 12:04:58 -04:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1 
BOM-70
 2019-08-09 20:19:18 +05: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
Ayub khan
e2dc90966e dnt remove cookie-concent 2019-08-09 13:26:55 +05:00
Feanil Patel
20b7f96770 Merge pull request #21310 from edx/feanil/moar_test_collection_fixes 
More test collection fixes.
 2019-08-08 16:23:15 -04: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
Jeremy Bowman
1835ee9a45 DEPR-33 Remove microsites from site_configuration (#20922) 2019-08-08 13:02:09 -04:00
Cory Lee
a8fd936d27 Delete enterprise reporting secret because I believe it is not used anywhere (#21309) 2019-08-08 13:00:57 -04:00
Ayub khan
3b074323b8 BOM-70 
-Remove Depricated View and tests
 2019-08-08 21:32:42 +05:00
Feanil Patel
b63d881462 Merge pull request #21303 from edx/BOM-80 
BOM-80
 2019-08-08 12:13:54 -04:00
Feanil Patel
1bb50088dc More test collection fixes. 2019-08-08 11:23:14 -04:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +05: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
Simon Chen
1b9cba5cf1 EDUCATOR-4539 update program access so global staff and course staff related cases can be handled 2019-08-07 09:01:37 -04:00
Alex Dusenbery
8a2bf2b60e EDUCATOR-4543 | Let the program_enrollments overview endpoint return course enrollment information for verified and masters mode enrollments, even if they are not directly tied to a ProgramCourseEnrollment. 2019-08-06 16:49:44 -04:00
Zachary Hancock
90c9103a89 command to remove social auth users (#21280) 
remove social auth users command
 2019-08-06 15:48:19 -04: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
Ayub
e5f3da9afa Merge pull request #21296 from edx/BOM-78 
BOM-78
 2019-08-06 18:49:19 +05:00
Ayub
3f2bd0a020 Merge pull request #21229 from edx/BOM-70 
BOM-70
 2019-08-06 18:48:42 +05:00
Ayub khan
2244540ade BOM-78 
Update uuid4().hex.decode(ascii) calls
 2019-08-06 17:16:08 +05:00
Ayub khan
c9080e257e -fixed tests 2019-08-06 15:31:41 +05:00
Calen Pennington
f319d20d6d Fix publishing for access control experiment 2019-08-05 14:53:56 -04:00
Alex Dusenbery
70e2aaa95b EDUCATOR-4543 | Add utility functions to the catalog module that picks out all of the course_runs associated with a program, even those that live inside the curriculum of a sub-program. Use these functions to populate the course -> program index of the catalog/programs cache. Also some refactoring of a program_enrollments overview endpoint. 2019-08-05 11:30:19 -04:00
Calen Pennington
0c01c6f056 Merge pull request #21285 from cpennington/masquerade-permission 
Switch courseware.masquerade_as_student over to using a StaffAccessRu…
 2019-08-05 10:46:58 -04:00
Calen Pennington
0cd8f58bcc Remove all instances of from instructor import imports 2019-08-05 09:59:30 -04:00
Calen Pennington
e0981f3b96 Switch generate_certificate_exceptions over to using a StaffAccessRule with query checking 2019-08-05 09:59:30 -04:00
Calen Pennington
23a91ba0f2 Switch generate_bulk_certificate_exceptions over to using a StaffAccessRule with query checking 2019-08-05 09:59:30 -04:00
Calen Pennington
b855275353 Switch enable_certificate_generation over to using a StaffAccessRule with query checking 2019-08-05 09:59:30 -04:00
Calen Pennington
32f154d3ea Switch reset_due_date over to using a StaffAccessRule with query checking 2019-08-05 09:59:30 -04:00
Calen Pennington
1aed6c882b Switch change_due_date over to using a StaffAccessRule with query checking 2019-08-05 09:59:30 -04:00
Calen Pennington
c3d86c9b3c Switch sale_validation over to using a StaffAccessRule with query checking 2019-08-05 09:59:30 -04:00
Calen Pennington
11677d052c Switch update_forum_role_membership over to using a StaffAccessRule with query checking 2019-08-05 09:59:30 -04:00
Calen Pennington
7d55483fbe Convert modify_access to require_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
04e5501324 Convert add_users_to_cohorts to require_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
a2ea80dbca Convert mark_student_can_skip_entrance_exam to require_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
c270273e13 Convert get_issued_certificates to use requires_course_permission 2019-08-05 09:59:30 -04:00
Calen Pennington
2e1fec921c Add a decorator that checks for course-level permissions 2019-08-05 09:59:30 -04:00
Ayub khan
9b3960ed90 -added zendesk api endpoints 2019-08-05 13:38:46 +05:00
Ayub khan
c965e13c73 BOM-70 
-Removed Submit-feedback View
-Removed related tests
-Removed help_modal.html
-Removed help_modal.html test
-Removed zendesk from requirements
-Updated requirements
 2019-08-05 13:38:46 +05:00
Calen Pennington
7bbf4ad15c Switch courseware.masquerade_as_student over to using a StaffAccessRule with query checking 2019-08-02 15:06:35 -04:00
Feanil Patel
dead415d2b :-( Moto and HTTPretty don't play well together. 
Moto has a vendored version of HTTPretty which also monkey patches the
socket object.  If you activate both, you get weird errors like
https://github.com/spulec/moto/issues/750

So we're opting not to activate both in this test.  We're are just using
the moto vendored version of httpretty for both our usage and the
mocking of boto.

I also removed the logic that seemed like it was just testing that our
mock is a mocking s3 correctly.
 2019-08-02 13:42:10 -04:00
Feanil Patel
624455c89a Use deprecated s3 mock from moto. 
Longer term we should move to boto3 in general and then we can use the
default moto mock for s3.
 2019-08-02 13:42:02 -04:00
David Ormsbee
358ba27a2a Merge pull request #21248 from open-craft/samuel/se-1155-fix-ccx-unicode 
SE-1155 [Campus.il] fix crashes on non-ascii in usernames for ccx enrollments
 2019-08-02 13:15:41 -04:00
Julia Eskew
a2dac21843 Add optional role parameter to course API endpoint. (#21059) 
* Add optional role parameter to course API endpoint.

* fixup! Add optional role parameter to course API endpoint.
 2019-08-02 12:52:30 -04:00