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

50751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nimisha Asthagiri
d226c08b26 Merge pull request #21300 from edx/arch/depr-20-open-id-auth 
DEPR-20 Remove django-openid-auth
 2019-08-06 16:32:25 -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
Calen Pennington
47e2786dd1 Merge pull request #21298 from cpennington/pytest-remote-contexts 
Use a different pytest contexts flag name to not conflict with the in…
 2019-08-06 15:09:07 -04:00
Nimisha Asthagiri
4c7d437bdd DEPR-20 Remove django-openid-auth 2019-08-06 14:02:48 -04:00
Calen Pennington
0804470e7a Use a different pytest contexts flag name to not conflict with the in-process version 2019-08-06 12:37:09 -04:00
Alex Dusenbery
f307e49f94 Add an index from program type to program UUID in the catalog cache. 2019-08-06 10:31:44 -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
b77793da5f Merge pull request #21292 from cpennington/correct-laboratory-tracebacks 
Remove publishing for access control experimnent for now
 2019-08-05 15:24:33 -04:00
Calen Pennington
f319d20d6d Fix publishing for access control experiment 2019-08-05 14:53:56 -04:00
Dave St.Germain
b57c1cdd0d Merge pull request #21291 from edx/dcs/upgrade-bulk-grades 
Upgrade bulk-grades
 2019-08-05 12:25:58 -04:00
Dave St.Germain
2e4cbbe250 Upgrade bulk-grades 2019-08-05 12:04:19 -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
98f740f71a Merge pull request #21270 from cpennington/upload-correct-coverage-file 
Upload the coverage report from reports/${TEST_SUITE}.coverage
 2019-08-05 10:47:48 -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
Aarif
54269f3dfa Merge pull request #21274 from edx/BOM-67 
BOM-67 Updated the dependencies for Django-Oauth-plus
 2019-08-05 19:34:24 +05: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
Waheed Ahmed
8b86a090a9 Merge pull request #21290 from edx/waheed/PROD-125-fix-course-org-link-rerun 
Fix course:org link creation upon rerun.
 2019-08-05 18:14:21 +05:00
Waheed Ahmed
23bc5af0fc Fix course:org link creation upon rerun. 
Upon rerun creation from publisher course:organization link
was not creating, due to which org logo was not appearing on
course certificates.

Fixed by creating course:org link upon rerun.

PROD-125
 2019-08-05 13:48:50 +05: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
aarif
a40c771a1c updated the github.in 
added the updated dependency for oauth2

added the commit hash instead of branch

minor fix

changes made by make upgrade
 2019-08-05 10:51:24 +05:00
Feanil Patel
2afc27741e Merge pull request #21266 from edx/feanil/moto_changes 
Upgrade moto to support python3.
 2019-08-02 15:07:43 -04: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
Calen Pennington
ff481bf748 Merge pull request #21287 from cpennington/test-admin-view 
Test the django admin view, and that it can be loaded
 2019-08-02 14:22:05 -04:00
Feanil Patel
9926fa0fbd Moto got better at checking permissions in their mock. 
Since we want anonymous read of these objects, we have to be explicit about
the bucket permissions or the test will fail.
 2019-08-02 13:42:13 -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
a5afacf62a These tests don't test anything interesting. 
They are running into issues because of a bug in moto but looking closer
at what they are testing.  Both tests test the happy path of the
underlying function.  In the happy path scenario all boto calls succeed
and all theses test do is test that but with all the boto calls mocked
out.  So we're just testing whether the mock is a good mock of boto
which is not useful.
 2019-08-02 13:42:06 -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
Feanil Patel
519e3a7ca3 Run make upgrade 2019-08-02 13:41:59 -04:00
Feanil Patel
74132f8ed9 Update moto to support python3. 
We had to pin json diff because of how we pull prod requirements into
testing.txt
 2019-08-02 13:41:55 -04:00
Calen Pennington
ea8c8e8348 Test the django admin view, and that it can be loaded 2019-08-02 13:27:16 -04:00
David Ormsbee
7140948bb1 Merge pull request #20900 from open-craft/pooja/fix-username-hints-with-SSO 
SE-1199 Campus.il Fix unicode username hints with SSO
 2019-08-02 13:17:00 -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