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

3723 Commits

Author SHA1 Message Date
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
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
3f2bd0a020 Merge pull request #21229 from edx/BOM-70 
BOM-70
 2019-08-06 18:48:42 +05:00
Ayub khan
c9080e257e -fixed tests 2019-08-06 15:31:41 +05: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
Ayub khan
9b3960ed90 -added zendesk api endpoints 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
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
Calen Pennington
ea8c8e8348 Test the django admin view, and that it can be loaded 2019-08-02 13:27:16 -04:00
Christie Rice
bf414335cc REVMI-354 Add edit_bookmark permission (#21254) 2019-08-02 11:01:43 -04:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243) 
* REVMI-354 Add enroll_in_course permission

* Fix test
 2019-08-01 08:37:41 -04:00
Calen Pennington
c00b60ffa5 Merge pull request #21244 from cpennington/check-permissions-view-course-home 
Check permissions view course home
 2019-07-30 13:06:13 -04:00
Calen Pennington
2d1eb9923f Convert a has_access check into a bridgekeeper rule 
This reverts commit 5e8f90caa1.
 2019-07-30 12:02:24 -04:00
Adeel Khan
05718a63db Fix xss-linter directives from edx-ace templates 
PROD-508
 2019-07-30 13:34:44 +05:00
Calen Pennington
03d7d87850 Merge pull request #21160 from cpennington/fbe-orphan-block 
Only attempt to use the parent's CONTENT_GATING_PARTITION settings if…
 2019-07-29 09:29:47 -04:00
Dave St.Germain
75b0afe721 Merge pull request #21162 from edx/mroytman/EDUCATOR-4434-gradebook-user-counts 
add number of total users and number of filtered users to the gradebo…
 2019-07-25 09:54:09 -04:00
Adeel Khan
7d9be69112 Fix edx-ace templates 
This patch is part of multiple PR's to
protect templates against xss attack

PROD-465
 2019-07-25 12:51:05 +05:00
Michael Roytman
77dc0fa9f0 add number of total users and number of filtered users to the gradebook API 2019-07-24 23:02:04 -04:00
Calen Pennington
1823d9f098 Add django app for running Coverage who-tests-what in bokchoy 2019-07-24 10:13:46 -04:00
Alex Dusenbery
8dbc1c2fcc EDUCATOR-4498 | Allow generate_jwt_signing_key to not include key prefixes. 2019-07-22 13:57:11 -04:00
Kyle McCormick
13681eb499 Add --update option to create_dot_access (#21172) 2019-07-22 13:15:23 -04:00
David Ormsbee
7c9f4a2533 Merge pull request #21178 from edx/ormsbee/remove_dashbaord_cookie_reset 
Remove user cookie reset on Student Dashboard.
 2019-07-22 10:40:42 -04:00
Ayub
044dc5f10a Merge pull request #21038 from edx/INCR-384 
INCR-384 python 3 compatibility
 2019-07-22 14:24:00 +05:00
David Ormsbee
0f51b58f75 Remove user cookie reset on Student Dashboard. 
The enrollmentStatusHash cookie value was created in commit f0030334
as an optimization, in order to determine whether the marketing site
needs to refresh the list of a student's enrolled courses with a
call to the LMS. To ensure that this value was kept up to date,
commit d7a7bcc1 reset the user's cookies every time they go to the
learner dashboard page (which used to be the next page loaded after
you enrolled in a course). This didn't just reset the
enrollmentStatusHash though -- it recalculated all the cookie
values, as if you had just logged in.

A number of things have changed since then:

1. Enrolling in a course now goes to that course's info/navigation
   page, rather than going to the student dashboard.
2. It doesn't appear that the value of enrollmentStatusHash is
   actually being examined anywhere -- it's set in a cookie on the
   LMS and read/written by the edX marketing front end code, but
   the value is never looked at to make any decisions.
3. The introduction of add_email_marketing_cookies (which triggers
   off of the CREATE_LOGON_COOKIE signal) has made cookie resets
   far more expensive, as there is a blocking call to Sailthru if
   you have that enabled in EmailMarketingConfiguration (which
   edx.org does). This can add over two seconds to the server
   processing time for the student dashboard at certain times of
   day.

Given this, I'm removing both the call to resetting the cookie on
the student dashboard page, as well as setting the value for
enrollmentStatusHash.
 2019-07-21 20:16:19 -04:00
Christie Rice
fee8e17f95 REVMI-341 Stop sending lms_client_id in jwt sent to ecommerce (#21167) 2019-07-19 10:46:46 -04:00
Feanil Patel
e51fae3784 letters doesn't exist in python 3.6 
Use `ascii_letters` instead which is a reasonable alternative for our
usecases.
 2019-07-19 09:48:10 -04:00
Ayub
10df92857f Merge pull request #21035 from edx/INCR-380 
INCR-380 python 3 compatibility
 2019-07-19 12:25:43 +05:00
Ayub
8da4955ea9 Merge pull request #21034 from edx/INCR-379 
INCR-379 python 3 compatibility
 2019-07-19 12:25:06 +05:00
Ayub
ef1da0f007 Merge pull request #21032 from edx/INCR-377 
INCR-377 python 3 compatibility
 2019-07-19 12:24:25 +05:00
Calen Pennington
0e187f85b7 Only attempt to use the parent's CONTENT_GATING_PARTITION settings if there is actually a parent 2019-07-18 15:08:12 -04:00
Aarif
d0a73e7f1a Merge pull request #21037 from edx/INCR-382 
INCR-382 Python 3 compatibility
 2019-07-18 13:13:47 +05:00
Ayub
c3ad8a2f48 Merge pull request #21030 from edx/INCR-376 
INCR-376 python3 compatibility
 2019-07-18 12:09:29 +05:00
Ayub
e324ccaf7e Merge pull request #21028 from edx/INCR-375 
INCR-375 python3 comptatibility
 2019-07-18 11:19:00 +05:00
Ayub
9e3d66f3d4 Merge pull request #21025 from edx/INCR-366 
INCR-366 python3 compatibility
 2019-07-18 11:17:49 +05:00
Alex Dusenbery
ba2f0725ee EDUCATOR-4498 | Add optional output-file option to generate_jwt_signing_key command. 2019-07-17 14:45:25 -04:00
Aarif
5e7f39efa8 Merge pull request #21027 from edx/INCR-367 
INCR-367 Python 3 compatibility
 2019-07-17 14:33:27 +05:00
Ayub
79872f54d9 Merge pull request #21019 from edx/INCR-355 
INCR-355 python3 compatibility
 2019-07-17 13:10:59 +05:00
Awais Qureshi
6f3680ced5 Merge pull request #21039 from edx/awais786/INCR-383 
INCR-383
 2019-07-17 12:22:37 +05:00
Ayub khan
8dfba01f14 INCR-355 python3 compatibility 2019-07-17 12:02:31 +05:00
Ayub
be92bba430 Merge pull request #21020 from edx/INCR-361 
INCR-361 python3 compatibility
 2019-07-17 10:46:42 +05:00
aarif
cdfee4348f ran python-modernize and isort on files mentioned in INCR-367 
changes made to comply with pylint
 2019-07-16 09:58:17 +00:00
Awais Qureshi
c89ecb384f Merge pull request #21026 from edx/awais786/INCR-368 
INCR-368
 2019-07-16 12:57:22 +05:00
Ayub
31ab0bed32 Merge pull request #21016 from edx/INCR-349 
INCR-349 python3 compatibility
 2019-07-16 12:36:54 +05:00
Awais Qureshi
46b089c12c Merge pull request #21021 from edx/awais786/INCR-357 
INCR-357
 2019-07-16 11:48:01 +05:00
Waheed Ahmed
eead45987f Merge pull request #21087 from edx/waheed/PROD-433-add-student-support-role 
Add system wide student support role.
 2019-07-12 12:30:08 +05:00
Matt Tuchfarber
b1998e202e Merge pull request #20945 from edx/tuchfarber/remove_journals 
Remove all references to Journals
 2019-07-11 11:08:24 -04:00
Waheed Ahmed
41e8f31765 Add system wide student support role. 
Created a data migration to add system wide student support
role, also registered SystemWideRoleAssignment into Django
admin.

PROD-433
 2019-07-11 20:03:23 +05:00
Ayub khan
2250411222 INCR-349 python3 compatibility 2019-07-11 13:29:34 +05:00