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

49648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Hall
0d5d67139f Merge pull request #20551 from edx/douglashall/ARCH-802 
Send duplicate provider to account MFE.
 2019-05-15 10:02:21 -04:00
edX requirements bot
964443afef Updating Python Requirements (#20599) 2019-05-15 09:38:14 -04:00
Uzair Rasheed
915862500d Merge pull request #20549 from edx/LEARNER-5984/round-off-grade 
Round off course card grade
 2019-05-15 18:15:32 +05:00
Zainab Amir
f7d567e3ca Merge pull request #20547 from edx/zamir/PROD_67_optimize_award_program_certificates 
Optimize award_program_certificates task
 2019-05-15 15:54:15 +05:00
uzairr
6f00a2a82d Round off course card grade 
Grades appeared with many decimals on their Programs page.To avoid it,
course grade is rounded off so that decimals can be ignored.

LEARNER-5984
 2019-05-15 14:36:59 +05:00
Jeremy Bowman
0b48665ad2 Fix flaky tab reordering test (#20555) 2019-05-14 16:10:46 -04:00
Stu Young
a6fce12162 Merge pull request #20550 from edx/estute/incr-pr-script-enhancement 
Estute/incr pr script enhancement
 2019-05-14 14:45:08 -04:00
Stuart Young
1e51f60ace bulk create incr tickets 2019-05-14 14:44:25 -04:00
Brian Mesick
805f4b6671 Merge pull request #20542 from edx/bmedx/update_instructor_data_verbiage 
DE-1479- update instructor dash verbiage for reports
 2019-05-14 14:02:07 -04:00
Douglas Hall
60ea09dff3 Send duplicate provider to account MFE. 2019-05-14 13:45:56 -04:00
Christie Rice
50c96def53 Merge pull request #20468 from edx/crice/REVEM-350_refactor 
REVEM-350 Consolidate code for user-metadata and dashboard-metadata
 2019-05-14 11:38:54 -04:00
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
edX requirements bot
aad7f32526 Updating Python Requirements (#20548) 2019-05-14 09:46:39 -04:00
Christie Rice
036375322a REVEM-350 Consolidate code for user-metadata and dashboard-metadata 2019-05-14 09:38:03 -04:00
Zainab Amir
fd15fcc47d Optimize award_program_certificates task 
More than 70% of the execution time is spent in CPU. The change of
query is to avoid the massive course_id__in the GeneratedCertificate
was doing on CourseOverview

PROD-67
 2019-05-14 15:19:03 +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
bmedx
8b997f7173 DE-1479, update instructor dash verbiage for reports 2019-05-13 13:05:06 -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
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