Commit Graph

2691 Commits

Author SHA1 Message Date
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95
BOM-95
2019-08-22 12:41:08 +05:00
Dave St.Germain
ab414c83c7 Merge pull request #21391 from edx/dcs/report-for-zoom
Include Zoom as a potential partner, for retirement requests
2019-08-21 11:34:07 -04:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm
Bom/python 3 swarm
2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95
assertItemsEqual with six.assertCountEqual
2019-08-21 17:01:40 +05:00
Dave St.Germain
37827b5df5 Include Zoom as a potential partner, for retirement requests 2019-08-20 16:28:41 -04: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
Feanil Patel
6e6c489f1f Merge pull request #21372 from edx/feanil/fix_cmp_issues
Fix a few issues we run into when running tests in python 3.
2019-08-20 11:28:23 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -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
Feanil Patel
1367b0cf3d Move the unicode_compatible decorator to the class. 2019-08-19 11:00:25 -04:00
Nimisha Asthagiri
05e1ec5bc0 Fix "TypeError: cannot use a string pattern on a bytes-like object" in cookies.py 2019-08-19 10:29:08 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
Ayub khan
ea0c6922fe BOM-87
Fixed the test for py3.
2019-08-19 18:52:19 +05:00
Feanil Patel
4c07dddc01 Merge pull request #21364 from edx/feanil/more_safe_session_fixes
More python 3 fixes in the safe_sessions middleware.
2019-08-19 09:41:09 -04:00
edx-pipeline-bot
b7392d809f Merge pull request #21368 from edx/private_to_public_53f6d7f
Mergeback PR from private to public.
2019-08-19 15:24:43 +05:00
AsadAzam
53f6d7fe15 Merge pull request #157 from edx/asad/prod-471
social link validation
2019-08-19 14:57:21 +05:00
Feanil Patel
c2d76a6072 More python 3 fixes in the safe_sessions middleware. 2019-08-17 23:03:41 -04:00
Ayub
98fa0b7b3e py3 bug fix (#21351) 2019-08-16 14:48:01 -04:00
Ayub
658cd5c62e BOM-70 (#21327)
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
2019-08-16 13:05:35 -04:00
Chris Pappas
4461d978db Running make upgrade to bump edx-enterprise version (#21344)
Fix for test that broke related to DRF;
2019-08-15 14:56:08 -04:00
Zachary Hancock
96f99bc053 reset integration environment endpoint (#21319) 2019-08-14 13:19:45 -04:00
Chris Pappas
4829fd4fde ENT-2117 | Creating new endpoint for enterprise learner portal. Includes small refactor of programs_enrollment GET logic, sowe do not need to duplicate the logic (#21258)
Adding new course_overview internal api

CourseOverview serializer work

Removing enterprise learner portal djangoapp from this repo

Removing ent learner portal url

Minor cleanups

Updating serializers again

typo

adding some tests and quality fixes

more quality fixes

Fixing test

Adding in an import i removed
2019-08-14 11:27:12 -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
David Ormsbee
7944e6b418 Override theme with site_theme query param 2019-08-08 20:36:21 -04:00
Jeremy Bowman
1835ee9a45 DEPR-33 Remove microsites from site_configuration (#20922) 2019-08-08 13:02:09 -04:00
Feanil Patel
b63d881462 Merge pull request #21303 from edx/BOM-80
BOM-80
2019-08-08 12:13:54 -04:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +05:00
Zainab Amir
6b78107081 Fix unregistered celery task (#21305)
openedx.core.djangoapps.ccxcon.tasks.update_ccxcon is not get auto
discovered by celery. Adding it to CELERY_IMPORTS to be explicitly
added.

PROD-283
2019-08-08 11:32:17 +05:00
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
asadazam93
138b3b35e0 social link validation 2019-08-07 18:45:53 +05: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
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
Adeel Khan
05718a63db Fix xss-linter directives from edx-ace templates
PROD-508
2019-07-30 13:34:44 +05: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
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
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
ef1da0f007 Merge pull request #21032 from edx/INCR-377
INCR-377 python 3 compatibility
2019-07-19 12:24:25 +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