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

50874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave St.Germain
bc2e87db5c Update edx-val 2019-08-19 11:15:10 -04:00
Nimisha Asthagiri
38333624ac Fixes for test_retire_order.py 2019-08-19 11:06:00 -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
Feanil Patel
65eebe63e7 Hash byte strings. 2019-08-19 11:00:22 -04:00
Dave St.Germain
3275388276 Merge branch 'feanil/fix_cmp_issues' of github.com:edx/edx-platform into feanil/fix_cmp_issues 2019-08-19 10:54:46 -04:00
Dave St.Germain
0267b5c85f Fix issue of out of order calls 2019-08-19 10:54:39 -04:00
Nimisha Asthagiri
b7019bddff CourseInfoTestCase fixes for "a bytes-like object is required, not 'str'" 2019-08-19 10:54:12 -04:00
Feanil Patel
1bfa575ada Update discussion api tests. 
json doesn't do any magic with byte strings in python 3.  In python 2 it
used to convert str objects to unicode automatically.
 2019-08-19 10:48:30 -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
Dave St.Germain
063c6fa1e5 Reload has moved in python3 2019-08-19 10:35:08 -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
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa 
Mergeback PR from private to public.
 2019-08-19 15:06:30 +05:00
AsadAzam
53f6d7fe15 Merge pull request #157 from edx/asad/prod-471 
social link validation
 2019-08-19 14:57:21 +05:00
Waheed Ahmed
912dfe4a63 Merge pull request #21366 from edx/waheed/remove-newrelic-constraint 
Newrelic released a patch, removing constraint.
 2019-08-19 14:49:50 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github 
Removed google api key from github
 2019-08-19 14:32:26 +05:00
Waheed Ahmed
8dc9ccd2ec Newrelic released a patch, removing constraint. 
PROD-533
 2019-08-19 14:20:03 +05:00
Feanil Patel
c2d76a6072 More python 3 fixes in the safe_sessions middleware. 2019-08-17 23:03:41 -04:00
Zainab Amir
db67a212e8 Remove create_user management command (#21322) 
Our internal docs suggest using manage_user instead of create_user. We
are no longer using it and it can be removed

LEARNER-3934
 2019-08-17 13:50:58 +05:00
Matt Hughes
ecd4a95507 Allow interventions CSV download via gradebook to be filtered 
JIRA:EDUCATOR-4537
 2019-08-16 17:05:06 -04:00
Feanil Patel
45e77457e0 Merge pull request #21357 from edx/feanil/fix_reload_error 
reload is not a system built-in in python 3.
 2019-08-16 16:14:15 -04:00
Feanil Patel
c99398899d Merge pull request #21358 from edx/feanil/pull_zendesk_config_from_yaml 
Be able to override this setting from yaml.
 2019-08-16 15:32:01 -04:00
Feanil Patel
46b730a9a0 reload is not a system built-in in python 3. 
If we're in python 3 import reload from importlib.
 2019-08-16 15:20:10 -04:00
Feanil Patel
9925aaadb9 Be able to override this setting from yaml. 2019-08-16 15:09:13 -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
Brittney Exline
36c5a368b8 Merge pull request #21356 from edx/bexline/revert_enterprise 
Reverting to last stable version of edx-enterprise
 2019-08-16 13:58:31 -04:00
Stu Young
d66655ae8a add script to create annotation report for feature toggles (#20970) 2019-08-16 13:36:44 -04:00
Brittney Exline
c29b1dd92a Reverting to last stable version of edx-enterprise 2019-08-16 13:31:07 -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
Stu Young
8cf86012cf modernize xdist scripts (#21347) 2019-08-16 11:26: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
Dave St.Germain
a394391a66 Merge pull request #21352 from edx/dcs/upgrade 
Upgrade edx-when to fix CR-1089
 2019-08-16 10:24:27 -04:00
Matt Hughes
c3a1a70d4f Correct discrepancy between grade data sources for gradebook 2019-08-16 10:02:46 -04:00
Dave St.Germain
ef67067d17 Upgrade edx-when to fix CR-1089 2019-08-16 09:57:14 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
edx-pipeline-bot
e585e0bdf2 Merge pull request #21348 from edx/private_to_public_c74331e 
Mergeback PR from private to public.
 2019-08-16 14:43:47 +05:00
Awais Jibran
c74331e16e Merge pull request #158 from edx/ormsbee/sec_609_customtag_fix 
Make CustomTagModule safe (remove Mako) [SEC-609]
 2019-08-16 13:52:51 +05:00
Syed Muhammad Dawoud Sheraz Ali
71ec2b05ae Merge pull request #21294 from edx/dsheraz/educator-4553 
Add Drag&Drop submission deadline acceptance tests
 2019-08-16 10:19:13 +05:00
DawoudSheraz
103a825d51 added DnD submission deadline acceptance tests 2019-08-16 09:50:56 +05:00
Manjinder Singh
65b858e3e7 Merge pull request #21209 from edx/msingh/discussion_topic_validation2 
PROD-145: Added validation to discussion topic input in studio, testing 2
 2019-08-15 19:53:17 -04:00
jinder1s
e7fb13a74f Added validation to discussion topic input in studio 2019-08-15 16:13:37 -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
edX Transifex Bot
a6526a8874 geoip2: update maxmind geolite country database 2019-08-14 17:01:43 -04:00