Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
Amit
8649385861 INCR-244: Make compatible with Python 3.x without breaking Python 2.7… (#20531) 
* INCR-244: Make compatible with Python 3.x without breaking Python 2.7 support on common/test/acceptance/pages [common, xblock]

* INCR-244: Add missing module docstring and fix for six import

* INCR-244: Update module docstring
 2019-05-14 11:10:25 -04:00
Anthony Wee
489c78dfa7 INCR-132: Run python-modernize on common/djangoapps/status (#20450) 
* INCR-132: Run python-modernize on common/djangoapps/status

* isort

* isort migrations
 2019-05-13 13:00:01 -04:00
Amit
65f4a63ecf INCR-248: Make compatible with Python 3.x without breaking Python 2.7… (#20529) 
* INCR-248: Make compatible with Python 3.x without breaking Python 2.7 support --> common/djangoapps/xblock_django

* INCR-248: Grouped absolute_import and unicode_literals imports

* INCR-248: Grouped absolute_import and unicode_literals imports for migrations
 2019-05-13 12:35:39 -04:00
Waheed Ahmed
98c286a009 Revert "Making honor code not eligible for Certificate" 
This reverts commit 25130ae3c8.
 2019-05-13 15:39:35 +05:00
asadazam93
e7cae866c3 Reverted logs 2019-05-13 12:38:55 +05:00
Chris Pappas
d937708432 Merge pull request #20438 from edx/cpappas/ENT-1887 
ENT-1887 | Adding logic for new business marketing footer url constru…
 2019-05-10 16:28:27 -04:00
Amit
40068aecb5 INCR-232: Run python-modernize and isort on common/djangoapps/track (#20513) 2019-05-10 12:05:31 -04:00
Amit
a10fbd682c INCR-231: Run python-modernize and isort at common/djangoapps/entitlements (#20515) 2019-05-10 11:14:18 -04:00
Stu Young
e1f47c0474 Merge pull request #20492 from edx/estute/delete-a-flaky-test 
remove flaky test
 2019-05-10 11:13:55 -04:00
Amit
9e6d71c49b INCR-144: Run python-modernize on common/djangoapps/microsite_configuration/tests (#20517) 2019-05-10 10:16:31 -04:00
Amit
0bd61d5d9f INCR-133: Run python-modernize on common/djangoapps/xblock_django [migrations, management, tests] (#20520) 2019-05-10 09:47:20 -04:00
Stu Young
c3571a5fb9 Merge pull request #20521 from amitvadhel/INCR-139 
INCR-139
 2019-05-10 09:44:26 -04:00
Amit
0491b3a14f INCR-170: Run python-modernize on common/lib [safe_lxml, sandbox-packages] (#20508) 2019-05-10 09:00:44 -04:00
Amit
07b75ae690 INCR-164: Run python-modernize on common/djangoapps/microsite_configuration [backends, management, migrations] (#20507) 2019-05-10 08:37:27 -04:00
amitvadhel
8ef8dd27b2 INCR-139: Run python-modernize on common/djangoapps/third_party_auth/tests [tests, data] 2019-05-10 12:54:01 +03:00
Christopher Pappas
4c5ca6d086 ENT-1887 | Adding logic for new business marketing footer url construction, while maintaining backwards compatibility 
Fixing quality test

Testsing out a default value for the sake of jenkins tests. will revert

Fix footer test from being flaky

Moving an import statement

ran isort. adding a test. fixing 1 quality issue

Quality cleanups

Attempting more quality fixes

adding back in config variable name for default value

Adding ENTERPRISE_MARKETING_FOOTER_QUERY_PARAMS to common settings

Changing marketing_url logic to only concatenate enterprise url to root if the enterprise url is relative (starts with a /)

quality fixes
 2019-05-09 17:15:47 -04:00
Brian Mesick
a4a009e57b Merge pull request #20222 from edx/bmedx/course_enrollment_history 
Re-adding django-simple-history for CourseEnrollment
 2019-05-09 13:02:07 -04:00
Amit
328bcbe047 INCR-135: Run python-modernize on common/djangoapps/edxmako (#20483) 2019-05-09 10:08:57 -04:00
Stuart Young
95b521c9c5 remove flaky test 2019-05-09 10:07:55 -04:00
Amit
f8ef9878d2 INCR-136: Run python-modernize at common/djangoapps/pipeline_mako (#20482) 2019-05-09 10:00:16 -04:00
Amit
9e2397a60a INCR-137: Run python-modernize at common/djangoapps/static_replace (#20481) 2019-05-09 09:36:45 -04:00
Kyle Mulka
d4cbcfd5d5 INCR-229 ran modernize and isort on some files (#20463) 
* INCR-229 ran modernize on common/lib/xmodule/xmodule/[a-g]*.py except for graders.py

* fix a couple xss-commit-linter issues
 2019-05-09 00:57:09 -04:00
edX Transifex Bot
5cb0473495 geoip2: update maxmind geolite country database 2019-05-08 17:18:32 -04:00
kill-gear
69584ca573 incr-177 run python-modernize on openedx/features/learner_profile (#20454) 
* incr-172

* incr-177 run modernize

* fixed bug due to running modernize
 2019-05-08 16:50:04 -04:00
David Ormsbee
7f676317e6 Merge pull request #20466 from edx/revert-18675-guruprasad/randomize-question-order-pr 
Revert "Fix the unpredictable order randomization issue with randomized content blocks"
 2019-05-08 13:39:06 -04:00
Kyle Mulka
b2e6ed0488 incr-205 ran modernize on common/djangoapps/course_modes (#20465) 2019-05-08 13:35:40 -04:00
David Ormsbee
d2af1d4c5b Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-05-08 12:42:44 -04:00
Jeremy Bowman
47292e5f92 Update StringIO usage for Python 3 (#20462) 2019-05-08 12:13:22 -04:00
Jon Kiparsky
a85f456e21 INCR-222: Run python-modernize on common/test/acceptance/tests/lms (#20420) 
* Run python-modernize on common/test/acceptance/tests/lms

* Fix code quality issues

* tweak mport order
 2019-05-08 10:16:56 -04:00
asadazam93
397ee3dc4e updated logs 2019-05-08 14:34:27 +05:00
Brendan
d35e88e271 INCR-214: python-modernize on common/lib/xmodule/xmodule/modulestore/tests (#20424) 
* INCR-214: python-modernize on common/lib/xmodule/xmodule/modulestore/tests

* Running isort on common/lib/xmodule/xmodule/modulestore/tests

* Resolving issues with mangled comments and fixing int/long test
 2019-05-07 23:49:43 -04:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
Cameron Cairns
6363090144 Addresses INCR-195 - runs modernise /student/tests (#20419) 2019-05-07 15:44:49 -04:00
Anthony Wee
3dcdf96faf INCR-123: Run python-modernize on common/djangoapps/track/backends (#20444) 
* anthonywee/INCR-123

* isort
 2019-05-07 15:16:42 -04:00
Anthony Wee
a0bb7e572d INCR-125: Run python-modernize on common/djangoapps/track/views and migrations (#20425) 
* INCR-125: Run python-modernize on common/djangoapps/track/views and migrations

* isort
 2019-05-07 14:26:57 -04:00
Anthony Wee
b095ce15c8 INCR-124: Run python-modernize on common/djangoapps/track/tests (#20445) 
* INCR-124: Run python-modernize on common/djangoapps/track/tests

* isort
 2019-05-07 14:05:38 -04:00
Anthony Wee
2ab8794c78 INCR-131: Run python-modernize on common/djangoapps/entitlements/api (#20448) 
* INCR-131: Run python-modernize on common/djangoapps/entitlements/api

* isort
 2019-05-07 13:05:21 -04:00
Anthony Wee
aa1d142ddd INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations (#20447) 
* INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations

* isort
 2019-05-07 13:01:04 -04:00
Anthony Wee
2d8dfa895f INCR-129: Run python-modernize on common/djangoapps/entitlements/management and tests (#20446) 
* INCR-129: Run python-modernize on common/djangoapps/entitlements/management

* isort

* INCR-129: Run python-modernize on common/djangoapps/entitlements/tests

* isort
 2019-05-07 12:52:09 -04:00
Brendan
6057527689 INCR-227: python-modernize on common/lib/xmodule/xmodule/video_module… (#20427) 
* INCR-227: python-modernize on common/lib/xmodule/xmodule/video_module, partitions, and util

* pylint will ignore imports from six

* INCR-227 Fixing mangled comments and variable names
 2019-05-07 12:13:02 -04:00
Kyle Mulka
ba993c5937 INCR-226 run modernize on common/lib/xmodule/xmodule/modulestore/mong… (#20431) 
* INCR-226 run modernize on common/lib/xmodule/xmodule/modulestore/mongo, split_mongo, and perf_tests

* fix pep8 error
 2019-05-07 10:36:58 -04:00
Evans Dianga
391b91b99a Modernize common/djangoapps/util- INCR-203 (#20437) 2019-05-07 09:53:17 -04:00
Evans Dianga
0063c6f3e7 INCR-122 Modernize track/management. (#20433) 
* Modernize track/management incr122. Change Author to myself

* Ran isort on common/djangoapps/track/management
 2019-05-07 09:33:20 -04:00
bmedx
e11e062292 Mock CourseEnrollment history for test performance 2019-05-06 18:03:41 -04:00
David Ormsbee
21cc1f4719 Merge branch 'master' into guruprasad/randomize-question-order-pr 2019-05-06 16:33:51 -04:00
Michael Youngstrom
367255c9de Merge pull request #20417 from mitodl/pdpinch/modernize-video-tests 
INCR-150 Modernize common/test/acceptance/tests/video
 2019-05-06 15:03:18 -04:00
Jeremy Bowman
47516dbead Run python-modernize on student/*.py (#20411) 2019-05-06 14:50:42 -04:00
Peter Pinch
f4dc8d57c4 incr-150 modernize common/test/acceptance/tests/video 2019-05-06 13:32:24 -04:00
Nimisha Asthagiri
bda16a9b6b Merge pull request #20354 from edx/bom/adr-python-api 
Initial top-level ADRs
 2019-05-06 13:22:26 -04:00
AsadAzam
e0bac508dd Merge pull request #20381 from edx/asad/prod-230-added-logs 
Added logs
 2019-05-06 12:28:40 +05:00