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

19459 Commits

Author SHA1 Message Date
Zachary Hancock
1bb449a742 Merge pull request #20653 from edx/zhancock/complete-waiting-enrollments 
complete waiting enrollments. fixed
 2019-05-29 10:30:16 -04:00
Zia Fazal
504decf345 Bumped edx-enterprise version and added cornerstone app 2019-05-29 14:21:09 +05:00
Zainab Amir
3eb13ae7ac Merge pull request from zamir/LEARNER_7313_move_command_arguments_to_common_settings 
Move command arguments to common settings
 2019-05-29 10:39:49 +05:00
Nimisha Asthagiri
01ccd877e6 Merge pull request #20702 from edx/bom/enrollment-readme 
Enrollments README and refactor
 2019-05-28 16:58:27 -04:00
Ned Batchelder
2de1e99586 Merge pull request #20701 from edx/nedbat/fix-one-message 
Move a message to make it extractable
 2019-05-28 13:07:32 -04:00
Stu Young
13e624a50b INCR-307 Run python-modernize on lms/djangoapps/discussion/rest_api (#20618) 
* run python modernize

* run isort

* Fix quality
 2019-05-28 12:51:49 -04:00
Stu Young
22856fdc1a INCR-315 (#20610): python-modernize lms/djangoapps/grades/tests 
* run python modernize
* run isort
* fix pylint issues
 2019-05-28 11:21:34 -04:00
Nimisha Asthagiri
6e214a85b0 Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments 2019-05-28 11:20:53 -04:00
Dave St.Germain
a0468787aa Merge pull request #20677 from edx/dcs/track-cohort-sgp 
Added track and cohort filter for CSV score export
 2019-05-28 11:14:36 -04:00
Dave St.Germain
14cab5aa16 Added course_id to get_course_cohorts 2019-05-28 10:21:26 -04:00
Jeremy Bowman
ff7292538e More pylint fixes (#20692) 2019-05-28 09:19:31 -04:00
Ned Batchelder
7c6b49e460 Move a message to make it extractable 2019-05-28 09:04:25 -04:00
DawoudSheraz
831a106bfa update email subtask logs 2019-05-28 16:53:24 +05:00
Zainab Amir
886834adb5 Move command arguments to common settings 
Move command parameter arguments, resend-days and days-range, to
common settings. This will help in creating a consistency when the
default values are changed in the future.

LEARNER-7313
 2019-05-28 14:49:27 +05:00
David Ormsbee
2b0151ceac Merge pull request #20266 from open-craft/josuebc/upstream/BB-1063 
Add capability to override MANUAL_ENROLLMENT_ROLE_CHOICES
 2019-05-24 15:46:25 -04:00
David Ormsbee
99aa4bfd88 Merge pull request #20099 from stvstnfrd/sysadmin/datatable 
Cleanup datatable code in sysadmin user tab
 2019-05-24 15:42:23 -04:00
Matt Hughes
af9dad5214 Merge pull request #20660 from edx/matthugs/EDUCATOR-4327 
Add endpoint for checking learner program enrollments
 2019-05-24 15:23:16 -04:00
Zach Hancock
a350d327de complete waiting enrollments. fixed 2019-05-24 13:47:49 -04:00
Nimisha Asthagiri
1ebecef5ed Prevent JWT Authentication from updating LMS User Data 2019-05-24 12:24:05 -04:00
jansenk
65bab28341 add retirement endpoint 2019-05-24 11:29:02 -04:00
Jeremy Bowman
f9929f32b5 Update quality threshold counts (#20681) 2019-05-24 08:27:54 -04:00
Dave St.Germain
fdc785bfb0 Merge pull request #20605 from edx/mroytman/EDUCATOR-4276-get-course-enrollments 
program course enrollment overview GET endpoint
 2019-05-24 07:39:45 -04:00
Matt Hughes
047c379cab Add endpoint for checking learner program enrollments 
JIRA:EDUCATOR-4327
 2019-05-23 10:37:13 -04:00
Richard I Reilly
32b70650a4 Merge pull request #20658 from edx/rir/readme 
Add UML diagram for the ProgramEnrollments Plugin
 2019-05-23 09:49:35 -04:00
Zachary Hancock
8012e3a1ca Merge pull request #20630 from edx/zhancock/expire-prgm-enrollments 
command to expire waiting program enrollments
 2019-05-23 09:22:32 -04:00
Andytr1
6b5040df0e Merge pull request #20672 from edx/andytr1/update_header 
updated header location, error handling
 2019-05-23 08:21:33 -04:00
Usama Sadiq
6faa5bdf1b Merge pull request #20539 from edx/usama/learner-7023-Mathjax-Configurations 
MathJax Output Format in LMS

Issue: 
MathJax expressions were not rendering properly in the drop-down menu. 

Reason: 
MathJax SVG configurations do not work properly in case of a drop-down menu.

Solution:
The output format for MathJax expressions changed from SVG to HTML to allow the MathJax rendering in the drop-down menu as well.
 2019-05-23 13:57:12 +05:00
atesker
d88e41db46 updated header location, error handling 2019-05-22 15:51:36 -04:00
Ned Batchelder
f00eb4f3b4 Merge pull request #20600 from edx/nedbat/fix-trademark-notice 
Correct the trademark notices
 2019-05-22 15:36:11 -04:00
Zach Hancock
d9dc0d4b8d command to expire waiting program enrollments 2019-05-22 13:38:10 -04:00
Michael Roytman
b0f715d1c2 add a GET endpoint to get course run overviews for a user's program enrollment 2019-05-22 13:35:49 -04:00
adeelehsan
db50cbe503 Merge pull request #20598 from edx/aehsan/prod-277/update_the_edx_icp_license 
Updated ICP license in edx footer
 2019-05-22 22:12:56 +05:00
usama sadiq
2091535b2d LMS MathJax output format Update 
MathJax format updated to HTMLorMML instead of SVG
Test files updated in lms.
 2019-05-22 11:59:32 +05:00
usama sadiq
a59964119f Updated Output format in both LMS and CMS 2019-05-22 11:59:32 +05:00
Michael Roytman
5da94023e6 Merge pull request #20620 from edx/mroytman/bulk-email-python-api 
introduce Python API for BulkEmail Djangoapp
 2019-05-21 18:38:24 -04:00
atesker
0bd94327fe killed rebase 2019-05-21 14:35:10 -04:00
Stu Young
d5ee03e81d INCR-258 Run python-modernize on lms/djangoapps/experiments (#20560) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:48:28 -04:00
Stu Young
5e6c7b9911 INCR-253 Run python-modernize on lms/djangoapps/shoppingcart/management lms/djangoapps/shoppingcart/tests (#20554) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:46:26 -04:00
Stu Young
760743cca2 INCR-294 Run python-modernize on lms/djangoapps/bulk_enroll (#20601) 
* run python modernize

* run isort

* Fix python
 2019-05-21 11:45:40 -04:00
Stu Young
4cf2e855c9 INCR-302 Run python-modernize on lms/djangoapps/discussion/django_comment_client/base (#20626) 
* run python modernize

* run isort

* Fix quality

* Fix quality
 2019-05-21 11:44:57 -04:00
Stu Young
51948f8895 INCR-306 Run python-modernize on lms/djangoapps/discussion/settings and lms/djangoapps/discussion/tests (#20619) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:44:00 -04:00
Stu Young
787868d48b INCR-308 Run python-modernize on lms/djangoapps/ccx/tests (#20617) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:43:22 -04:00
Stu Young
3e11ac8863 INCR-314 Run python-modernize on lms/djangoapps/grades/config and lms/djangoapps/grades/settings (#20611) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:42:18 -04:00
Stu Young
95986d162b INCR-280 Run python-modernize on lms/djangoapps/commerce/api/v1 (#20579) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:41:15 -04:00
Stu Young
94efff4636 INCR-279 Run python-modernize on lms/djangoapps/commerce/migrations (#20580) 
* run python modernize

* run isort
 2019-05-21 11:40:28 -04:00
Stu Young
caa9fd0009 INCR-254 Run python-modernize on lms/djangoapps/shoppingcart/migrations and lms/djangoapps/shoppingcart/processors (#20556) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:39:46 -04:00
Stu Young
1e01baf979 INCR-255 Run python-modernize on lms/djangoapps/notes (#20565) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:38:26 -04:00
Stu Young
ea98e08362 INCR-256 Run python-modernize on lms/djangoapps/debug (#20564) 
* run python modernize

* run isort
 2019-05-21 11:37:47 -04:00
Stu Young
367736614d INCR-259 Run python-modernize on lms/djangoapps/survey (#20561) 
* run python modernize

* run isort
 2019-05-21 11:35:25 -04:00
Stu Young
da616921f0 INCR-257 Run python-modernize on lms/djangoapps/bulk_email/migrations and lms/djangoapps/bulk_email/tests (#20563) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:34:42 -04:00