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

3755 Commits

Author SHA1 Message Date
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
b80fd1f843 Fix for 'UUID' object has no attribute 'get_hex' in openedx/core/lib/xblock_utils/__init__.py 2019-08-19 10:36:43 -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
Feanil Patel
269a57445d Fix a few issues we run into when running the discussion tests. 2019-08-19 10:14:29 -04: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
Emma Green
7e670731ae Merge pull request #21346 from edx/emma-green/REV-902/add-endpoint-that-takes-a-user-id 
add endpoint that takes a user id to allow us to correctly get the di…
 2019-08-16 14:45:59 -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
Feanil Patel
f5f875401a Fix some of the common test collection issues. (#21340) 
* Remove old  performance tests that we haven't been running.

As far as I can tell, these tests to capture HAR files were created 5
years ago and not being run as a part of our suite?  They capture HAR
data that we do nothing with so even if they were running we should
remove them until we're ready to care about consuming this kind of
information.

* Update password test unicode string.
* Add ugettext translation helper function.
* Fix lambda syntax that is not valid in python 3.
* Fix ur raw strings which his not valid in python 3
* Use edx_six.get_gettext instead of ugettext.
* Fix a few other encoding issues.
* Don't use old form of sorted funciton.

This form which uses a 'cmp' method is not available in python 3.
 2019-08-16 11:31:36 -04:00
Diana Huang
5d7d3f7770 Merge pull request #21336 from edx/diana/remove-microsites 
Remove microsite djangoapp and configuration.
 2019-08-16 10:55:56 -04:00
Emma Green
48c17803c2 add endpoint that takes a user id to allow us to correctly get the discount after checkout to correctly create order 2019-08-16 10:55:39 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -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
Awais Qureshi
16b80f5165 Merge pull request #21302 from edx/awais786/BOM-82 
BOM-82
 2019-08-08 12:36:31 +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
Calen Pennington
0cd3e193b5 Change the name of the remote context plugin 2019-08-07 12:45:22 -04:00
asadazam93
138b3b35e0 social link validation 2019-08-07 18:45:53 +05:00
arbisoft
9d87c3c83b python 2 and 3 compatible method. 2019-08-07 17:01:30 +05: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
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