Commit Graph

49633 Commits

Author SHA1 Message Date
Hammad Ahmad Waqas
cdc8ddf190 clearing all relevant cache if enterprise customer change DSC enable flag. 2019-05-14 17:50:48 +05:00
Uzair Rasheed
82ce621e0f Merge pull request #20489 from edx/LEARNER-7057/anomaly-in-certificates-visibility
Anomaly in certs visibility on user profile.
2019-05-14 14:46:52 +05: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
Amit
d0810a5c94 INCR-249: Make compatible with Python 3.x without breaking Python 2.7 support (#20528)
* INCR-249: Make compatible with Python 3.x without breaking Python 2.7 support --> openedx/core/djangoapps/content/block_structure

* INCR-249: Grouped six package

* INCR-249: Remove the duplicate lines for absolute_import
2019-05-13 12:15:05 -04:00
Amit
3a1c68fb30 INCR-243: Make compatible with Python 3.x without breaking Python 2.7 support for openedx/core/djangoapps/models openedx/core/djangoapps/debug (#20532) 2019-05-13 09:29:07 -04:00
edX requirements bot
cceb3f1b67 Updating Python Requirements (#20538) 2019-05-13 09:14:32 -04:00
AsadAzam
73727c7d3f Merge pull request #20535 from edx/asad/PROD-230-revert-logs
Reverted logs
2019-05-13 13:54:46 +05:00
asadazam93
e7cae866c3 Reverted logs 2019-05-13 12:38:55 +05:00
edX requirements bot
64684cdf0e Updating Python Requirements (#20533) 2019-05-12 20:30:04 -04:00
Richard I Reilly
4592d6c2e4 Merge pull request #20526 from edx/rir/programEnrollmentPatch
Add PATCH method for program enrollments
2019-05-10 16:31:54 -04: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
Rick Reilly
604ab4fd15 Add PATCH method for program enrollments 2019-05-10 15:46:40 -04:00
Chris Pappas
b5e1aba53e Merge pull request #20527 from edx/cpappas/ENT-1888
ENT-1888 | Running make upgrade to upgrade edx-enterprise package
2019-05-10 15:33:36 -04:00
Christopher Pappas
5dfb29b655 ENT-1888 | Running make upgrade to upgrade edx-enterprise package 2019-05-10 14:45:43 -04:00
Amit
f587bb8297 INCR-234 (#20511)
* INCR-234: Run python-modernize and isort on openedx/core/djangoapps/oauth_dispatch

* INCR-234: [ADD] Missing module docstring
2019-05-10 14:10:35 -04:00
Amit
fd7527e136 INCR-239 (#20510)
* INCR-239: Run python-modernize and isort on openedx/core/djangoapps/programs [tests, tasks]

* INCR-239: Grouped six package and represent unused variables with _
2019-05-10 12:35:41 -04:00
Bill Tucker
eb0f52d110 INCR-211: run python-modernize and isort (#20432)
* INCR-211:  run python-modernize and isort to support python2 --> python3 transition

* INCR-211: fix pylint errors.

Removed unused module import request and error.
Used import as to avoid too deep a function call.

Altering imports and using suppression of pylint's import error.

* INCR-211: ignore pylint's import error from six module.

* INCR-211: remove unused modules.  Ignore pylint import error from six module.

* INCR-211:  ignore pylint's import error from six module.  Group imports.

* INCR-211:  disable error of 'must be called with literal string'

The specific context for this error means we can disable this.

* INCR-211: change import to satisfy pylint by renaming import

* INCR-211: fix imports so six.unichr works.
2019-05-10 12:14:41 -04:00
Amit
40068aecb5 INCR-232: Run python-modernize and isort on common/djangoapps/track (#20513) 2019-05-10 12:05:31 -04:00
emma-green
7dcd8071c4 Merge pull request #20258 from edx/emma-green/REVEM-282/A/Add-discount-applicability-endpoint
Add applicability endpoint
2019-05-10 11:23:57 -04:00
Amit
13fc8a7dd5 INCR-240 (#20509)
* INCR-240: Run python-modernize and isort on openedx/core/djangoapps/util

* INCR-240: [ADD] Missing module docstring at ratelimit
2019-05-10 11:23:05 -04:00
Jeremy Bowman
8ac7177793 Remove dependency on django-cas (#20505) 2019-05-10 11:14:51 -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
833d0af8cc INCR-149 (#20516)
* INCR-149: Run python-modernize on openedx/core/djangoapps [self_paced, coursegraph]

* INCR-149: Groups to absolute_import and unicode_literals
2019-05-10 11:11:42 -04:00
Zachary Hancock
2df1ca0c97 Merge pull request #20460 from edx/zhancock/complete-waiting-enrollments
complete waiting enrollments
2019-05-10 10:57:39 -04:00
Amit
3fdb4fc2f5 INCR-235: Run python-modernize and isort on openedx/core/djangoapps/user_authn [tests, user_authn] (#20514) 2019-05-10 10:52:29 -04:00
Stu Young
0e84d8fa4d Merge pull request #20518 from amitvadhel/INCR-INCR-158
INCR-158
2019-05-10 10:29:44 -04:00
Amit
9e6d71c49b INCR-144: Run python-modernize on common/djangoapps/microsite_configuration/tests (#20517) 2019-05-10 10:16:31 -04:00
Stu Young
293d8f95f0 Merge pull request #20519 from amitvadhel/INCR-141
INCR-141
2019-05-10 10:12:07 -04:00
Zach Hancock
b041a1f3e6 complete waiting enrollments 2019-05-10 09:55:24 -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
Emma Green
7ae68aa383 add applicability endpoint 2019-05-10 09:11:54 -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
73f26071b6 INCR-116: Run python-modernize on openedx/core/djangoapps/cache_toolbox (#20504) 2019-05-10 08:55:42 -04:00
edX requirements bot
d748a99b61 Updating Python Requirements (#20523) 2019-05-10 08:43:07 -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
uzairr
cefebce67a Anomaly in certs visibility on user profile.
While visiting a profile of another user from a non-staff account,
backend is returning html of its certs in page source.To avoid it,
a check is added in backend so that certs are only added when the
visiting user is itself visiting its profile or it would be a staff.

LEARNER-7057
2019-05-10 16:13:16 +05: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
amitvadhel
467eb70f50 INCR-141: Run python-modernize on openedx/core/djangoapps/content/block_structure [migrations, management, config] 2019-05-10 12:13:17 +03:00
amitvadhel
49b3d05375 INCR-INCR-158: Run python-modernize on openedx/core/djangoapps/site_configuration 2019-05-10 12:01:15 +03:00
Amit
1d1bbc3176 INCR-145 (#20486)
* INCR-145: Run python-modernize on openedx/core/djangoapps/contentserver

* INCR-145: [FIXED] line over length limit

* INCR-145: [ADD] Missing whitespace
2019-05-09 17:44:45 -04: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
Amit
a74cddefee INCR-160 (#20490)
* INCR-160: Run python-modernize on openedx/core/djangoapps/verified_track_content

* INCR-160: [FIX] line over length limit, datetime - pytz import
2019-05-09 15:00:06 -04:00
Douglas Hall
9f91a2b650 Merge pull request #20496 from edx/douglashall/ARCH-727
Upgrade edx-enterprise to 1.5.0.
2019-05-09 14:21:47 -04:00
aliciaerwin
140fb1394e INCR-166 Run python-modernize on openedx/core/djangolib (#20473)
* INCR-166 Run python-modernize on openedx/core/djangolib

* INCR-166 disabled harmless errors and added docstring
2019-05-09 13:59:48 -04:00
aliciaerwin
d03f970be6 INCR-159 Run python-modernize on openedx/core/djangoapps/zendesk_proxy (#20474)
* INCR-159 Run python-modernize on openedx/core/djangoapps/zendesk_proxy

* INCR-159 added docstring and disabled spurious import error
2019-05-09 13:39:37 -04:00
Kyle Mulka
bf47cd0cc2 incr-178: ran modernize on openedx/features/content_type_gating (#20470)
*  incr-178: ran modernize on openedx/features/content_type_gating

* removed unused imports

* ran isort on openedx/features/content_type_gating/migrations
2019-05-09 13:25:59 -04:00
Amit
7f403e8785 INCR-146 [Python2 > Python3] (#20488)
* INCR-146: Run python-modernize on openedx/core/djangoapps/cors_csrf

* INCR-146: Disable pylint warning for import-error
2019-05-09 13:17:51 -04:00