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

437 Commits

Author SHA1 Message Date
Ned Batchelder
05700f724e Remove unused code 2020-01-02 07:22:17 -05:00
Feanil Patel
046feb0cf0 Merge pull request #22649 from edx/feanil/fix_pep8 
Fix all E303 pep8 errors.
 2019-12-30 13:32:26 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts 
Run `2to3 -f asserts . -w` on edx-platform.
 2019-12-30 12:13:42 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w 
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
 2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform. 
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
 2019-12-30 10:22:19 -05:00
Feanil Patel
1411ef548c Merge branch 'master' into release-mergeback-to-master 2019-12-13 10:28:35 -05:00
Diana Huang
40c98fb22b Copy list in a way that is both Py2 and Py3 compatible. 2019-12-12 12:17:56 -05:00
Feanil Patel
a8ea9844dc Deal with cache misses. 2019-12-12 11:40:59 -05:00
Diana Huang
e005c0461e Handle the caching of responses between Python 2 and Python 3. 2019-12-12 11:18:43 -05:00
Zainab Amir
3e426ccecc Suppress grade on dashboard (#22471) 
Learners should not be able to view final grade before course end
date.Suppress the grade achieved so far till course end date on
dashboard.

PROD-701
 2019-12-12 17:22:58 +05:00
Chris Pappas
0e1dba1b24 ENT-1289 | Running make upgrade to bump edx-enterprise (#22047) 2019-10-16 10:18:15 -04:00
Chris Pappas
69bb6b582b ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2… (#21916) 
* ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2.0.0 (and 1.11.0)

* Skipping db_migration test for first part of removal of enterprisecustomerentitlements
 2019-10-03 16:55:55 -04:00
Diana Huang
abf77b1ae1 Drop notes tables. 2019-10-02 14:11:15 -04:00
Awais Qureshi
984063c819 BOM-593 
Python3 fix.
 2019-09-24 14:22:45 +05:00
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm 
Python3 swarm
 2019-09-19 10:23:04 -04:00
Jeremy Bowman
07ab555d05 Fix most common/djangoapps/util tests 2019-09-18 14:26:41 -04:00
aarif
1c0b78c0b3 python 3 fixes 
minor fixes

minor changes
 2019-09-18 18:10:14 +05:00
aarif
098bce230f python 3 fixes 2019-09-17 17:29:41 +05:00
Aarif
9370492005 Merge pull request #21652 from edx/BOM-474 
BOM-474
 2019-09-17 14:47:21 +05:00
Aarif
ba3a7e733d Merge pull request #21651 from edx/BOM-473 
BOM-473
 2019-09-17 13:45:07 +05:00
aarif
76706553bf python 3 fixes 
test fixes
 2019-09-16 17:19:18 +05:00
aarif
e791325f6c quality fixes 2019-09-16 17:02:33 +05:00
aarif
38ad965c2e test fixes 2019-09-16 16:36:12 +05:00
aarif
602b6d4607 minor fixes 2019-09-16 15:59:02 +05:00
aarif
d95474e060 python 3 fixes 
further fixes
 2019-09-13 17:34:47 +05:00
aarif
ae8126bf98 python 3 fixes 2019-09-13 16:50:20 +05:00
Kyle McCormick
77aacee6ed Add query util read_replica_or_default() 
This is similar to use_read_replica_if_available(),
but it just returns either 'read_replica' or
'default', for use with the Django ORM using()
method. Syntactically, it fits nicer with queryset
method-call chains.
 2019-09-12 14:54:03 -04:00
aarif
ec894ee10c python 3 fixes 
fixed test failures

fixed test failures

python 3 fixes

fixed test failures

fixed test failures

changes made as suggested

minor change
 2019-09-05 15:29:09 +05:00
Kyle McCormick
ea5652010c Create Python API for program_enrollments: Part I (#21511) 
This is the first in a series of commits to create
a Python API for the LMS program_enrollments app.
We do some general refactoring, renaming, and clean-up
in order to move toward the creation of that API.

EDUCATOR-4321
 2019-09-04 14:06:00 -04:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Ayub khan
8e71206312 BOM-96 
-fixes all issues
 2019-09-02 13:30:33 +05: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
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
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -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
Nimisha Asthagiri
b97db5aa86 Fix encode before calling md4 hash in common/djangoapps/util/memcache.py 2019-08-19 11:51:05 -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
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
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -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
Ayub khan
3b074323b8 BOM-70 
-Remove Depricated View and tests
 2019-08-08 21:32:42 +05:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +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
636af346d5 Don't skip the migration test. 2019-07-26 16:27:14 -04:00