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

19343 Commits

Author SHA1 Message Date
Stu Young
90aea81dec incr-269 (#20570) 
* run python modernize

* run isort
 2019-05-15 14:43:46 -04:00
Christie Rice
822b2deca0 Merge pull request #20616 from edx/estute/INCR-309 
INCR-309 Run python-modernize on lms/djangoapps/ccx/migrations
 2019-05-15 14:30:58 -04:00
Douglas Hall
f4b7acfe00 Merge pull request #20613 from edx/estute/INCR-312 
incr-312
 2019-05-15 14:23:31 -04:00
Stu Young
a10c4186e5 incr-311 (#20614) 
* run python modernize

* run isort
 2019-05-15 14:23:02 -04:00
Christie Rice
2659b00bc7 Merge pull request #20607 from edx/estute/INCR-316 
INCR-316 Run python-modernize on lms/djangoapps/grades/rest_api/v1
 2019-05-15 14:12:54 -04:00
Stu Young
2b1efa4589 incr-318 (#20609) 
* run python modernize

* run isort
 2019-05-15 14:03:26 -04:00
Stuart Young
904cbf6d63 run isort 2019-05-15 10:00:40 -04:00
Stuart Young
4041fd69ae run python modernize 2019-05-15 10:00:38 -04:00
Stuart Young
3739609bef run isort 2019-05-15 09:59:53 -04:00
Stuart Young
43b885995d run python modernize 2019-05-15 09:59:51 -04:00
Stuart Young
b0250e3b38 run isort 2019-05-15 09:59:27 -04:00
Stuart Young
8b7bb776b0 run python modernize 2019-05-15 09:59:25 -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
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
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
bmedx
8b997f7173 DE-1479, update instructor dash verbiage for reports 2019-05-13 13:05:06 -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
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
Zachary Hancock
2df1ca0c97 Merge pull request #20460 from edx/zhancock/complete-waiting-enrollments 
complete waiting enrollments
 2019-05-10 10:57:39 -04:00
Zach Hancock
b041a1f3e6 complete waiting enrollments 2019-05-10 09:55:24 -04:00
Emma Green
7ae68aa383 add applicability endpoint 2019-05-10 09:11:54 -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
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
David Ormsbee
d2af1d4c5b Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-05-08 12:42:44 -04:00
Christie Rice
41bec63cc7 Merge pull request #20451 from edx/crice/REVEM-329_date 
REVEM-239 Add audit access expiration deadline to user-metadata
 2019-05-08 09:49:10 -04:00
Christie Rice
6db32a36bc REVEM-239 Add audit access expiration deadline to user-metadata 2019-05-08 08:53:21 -04:00
DawoudSheraz
ca0800a4b1 added logs for more information 2019-05-08 16:29:33 +05:00
uzairr
3d7b60dde4 Make copyright year dynamic 
Currently, course email templates have hard-coded copyright year.
Marketing team needs to ping engineering to update it every year.
In this PR, steps are taken to make it dynamic.

PROD-106
 2019-05-08 13:08:28 +05:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
jansenk
1caa647621 add program course enrollment PATCH 2019-05-07 15:52:03 -04:00
David Ormsbee
21cc1f4719 Merge branch 'master' into guruprasad/randomize-question-order-pr 2019-05-06 16:33:51 -04:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -04:00
bmedx
17cb93dd51 Re-adding django-simple-history for CourseEnrollment 2019-05-03 16:16:41 -04:00
Diana Huang
c8593a8615 Merge pull request #20265 from edx/diana/remove-diff-paid 
Remove Diff Paid experimental features.
 2019-05-03 16:03:48 -04:00
Diana Huang
c6a89b03b9 Remove Diff Paid experimental features. 2019-05-03 15:09:20 -04:00
Rick Reilly
350b4a2589 Add POST method for program enrollments 2019-05-03 14:14:04 -04:00
Alex Dusenbery
403fb52e93 Add a GET endpoint to list ProgramCourseEnrollment data. 2019-05-03 13:39:10 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
c606aaeb57 Discussion consolidation: quality 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
7b4b6c3539 Move notifier and notification_prefs to discussion/ 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
b949452eb2 Move discussion_api to discussion/rest_api 2019-05-03 12:07:21 -04:00
Nimisha Asthagiri
16edae0822 Move comment_client into django_comment_common 2019-05-03 12:07:20 -04:00
Matthew Piatetsky
38aeafefb0 Merge pull request #20363 from edx/REVMI-170 
[WIP] add first purchase offer banner on course home
 2019-05-03 11:56:21 -04:00
Uzair Rasheed
a72d71deea Merge pull request #20380 from edx/PROD-185/fix-text-alignment-in-table 
Fix text alignment for word-break
 2019-05-03 12:50:11 +05:00