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

17200 Commits

Author SHA1 Message Date
edX cache uploader bot
be000cb8cd Updating Bokchoy testing database cache (#21379) 2019-08-20 11:29:33 -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
Jeremy Bowman
97c0684755 Cleaner fix for byte conversion in from_xml 2019-08-19 14:26:08 -04:00
Diana Huang
eaec9febb4 Merge pull request #21355 from edx/diana/microsite-deletion-migrations 
Deletion migration for microsites tables.
 2019-08-19 13:34:44 -04:00
Feanil Patel
085b6b9468 Fix runtime error where dict is modified during iteration. 2019-08-19 11:16:29 -04:00
Dave St.Germain
bc2e87db5c Update edx-val 2019-08-19 11:15:10 -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
Dave St.Germain
063c6fa1e5 Reload has moved in python3 2019-08-19 10:35:08 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04: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
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
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
Diana Huang
3455ff7393 Deletion migration for microsites tables. 2019-08-16 16:30: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
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
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
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
edX Transifex Bot
a6526a8874 geoip2: update maxmind geolite country database 2019-08-14 17:01:43 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
Feanil Patel
9753eae441 Convert to using ExitStack instead of nested. (#21329) 
* Convert to using ExitStack instead of nested.

nested is not available in Python3.

* Use ExitStack from contextlib2.

ExitStack has not been backported to the Python 2.7 standard library and
contextlib.nested is no longer available in Python 3.5.  We need to be
able to use something in both 2 and 3 as we transition so we'll pull in
contextlib2 which has backports of the full python3 contextlib.
 2019-08-12 16:55:05 -04:00
Feanil Patel
890e119951 Remove import of nested. 
We stopped using it but forgot to remove it from the import.
 2019-08-12 14:34:48 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85 
BOM-85
 2019-08-12 10:01:07 -04:00
aarif
4da4749f84 removed bulk_assertions context manager 
removed usages of bulk_assertion

changes made to comply quality failure

removing test-bulk assertions.
 2019-08-10 12:27:23 +05:00
arbisoft
9b87cb0172 BOM-85 
he builtin basestring abstract type was removed. Use str instead.
 2019-08-09 22:08:57 +05:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1 
BOM-70
 2019-08-09 20:19:18 +05:00
Ayub khan
3b074323b8 BOM-70 
-Remove Depricated View and tests
 2019-08-08 21:32:42 +05: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
adeelehsan
3136b3ecd3 Removed google api key from github 
Prod-349
 2019-08-08 02:12:21 +05:00
edX Transifex Bot
4538a65396 geoip2: update maxmind geolite country database 2019-08-07 20:33:14 +00: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
Feanil Patel
2c3e97dfbb Merge pull request #21301 from edx/feanil/fix_test_collection 
Fix some test collection in python 3.
 2019-08-07 10:12:10 -04:00
arbisoft
9d87c3c83b python 2 and 3 compatible method. 2019-08-07 17:01:30 +05:00
Zachary Hancock
90c9103a89 command to remove social auth users (#21280) 
remove social auth users command
 2019-08-06 15:48:19 -04:00
Feanil Patel
18e988b747 Fix some minor issues that prevent some tests from being collected. 2019-08-06 15:19:55 -04:00
David Ormsbee
483e654fcf Make CustomTagModule safe (remove Mako) [SEC-609] 
Prior to this commit, it was possible for course authoring teams
to import and execute Mako templates using the obscure "customtag"
tag (CustomTagModule). Since Mako templates can run Python code
(e.g. imports, database queries, etc.), this would give a course
team the ability to execute arbitrary, unsandboxed code on the
server.

This commit converts CustomTagModule to use the Python library's
string.Template instead. This should be broadly compatible with
the most basic and common usage of customtag, which is simple
variable substitution in the style of ${var_name}.
 2019-08-06 13:54:58 -04:00
Ayub
e5f3da9afa Merge pull request #21296 from edx/BOM-78 
BOM-78
 2019-08-06 18:49:19 +05:00
Ayub khan
2244540ade BOM-78 
Update uuid4().hex.decode(ascii) calls
 2019-08-06 17:16:08 +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
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
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
Nimisha Asthagiri
d20f68b6e0 Merge pull request #21282 from edx/arch/depr-15-notes-token 
DEPR-15: Remove usage of firebase-token-generator
 2019-08-02 09:19:07 -04:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00