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

19492 Commits

Author SHA1 Message Date
Dave St.Germain
4b84d630de Merge pull request #20719 from edx/dcs/grade-support 
API support for bulk grade import/export
 2019-06-05 14:46:15 -04:00
jansenk
cf32f5bcf9 allow orgs w/o idp configured to enroll students in a program 2019-06-05 12:55:54 -04:00
Christie Rice
b5d07783b9 REVMI-234 Include user id in jwt sent to ecommerce (#20743) 
* REVMI-234 Include user id in jwt sent to ecommerce

* Reorder params
 2019-06-05 10:27:23 -04:00
jansenk
095c420378 check curriculum rather than courses for program course membership 2019-06-04 14:06:00 -04:00
Dave St.Germain
cb5ec5a65d Grade api support for bulk grading 2019-06-03 13:53:30 -04:00
Alex Dusenbery
e5fd43264d EDUCATOR-4307 | Don't bother with celery to run expire waiting enrollments command. 2019-06-03 13:08:59 -04:00
David Ormsbee
12d893862c Merge pull request #20632 from tanyaxp/progress-certificates-title 
Remove the word "Student" from the progress title.
 2019-06-03 10:33:48 -04:00
Kyle McCormick
c487b9a384 Change 'withdrawn' status to 'canceled' in program_enrollments 
This makes the LMS program_enrollments API compatible with the
Registrar programs API, as specified in the Master's partner
integration guide.

EDUCATOR-4389
 2019-06-03 10:16:19 -04:00
alangsto
4a1346b068 INCR-265 Run python-modernize on lms/djangoapps/courseware/management and lms/djangoapps/courseware/tests (#20716) 
* updated files according to INCR-265

* fixed docstring and line-length problems from quality test

* Revert "fixed docstring and line-length problems from quality test"

This reverts commit d050f55a4ecfaa38f46b80ec4bb85ff399a79a8c.

* fixed errors reported in quality report

* had error, fixed it

* reversed change

* fixed over/under indentation, and added line to import.py that Ned had suggested

* tried disabling pylint for this line

* testing new email

* testing email in different window

* re-added symlink and docstring
 2019-05-31 14:07:18 -04:00
Ned Batchelder
f72b1d56de Merge pull request #20639 from edx/nedbat/welcome-message 
Some trademark improvements to the default home page
 2019-05-31 12:39:41 -04:00
Dave St.Germain
a2ca6f96d0 API support for bulk grade import/export 2019-05-31 09:28:44 -04:00
David Joy
6327b00575 Merge pull request #20683 from caesar2164/cleanup-bootstrap-footer 
Make platform bootstrap footer match other footer
 2019-05-30 14:55:50 -04:00
Feanil Patel
be1d0197ee Merge pull request #20724 from edx/feanil/fix_test_repo_reference 
Use our fork of this repo instead of the mitocw one.
 2019-05-30 14:53:58 -04:00
Feanil Patel
9ebcf758df Use our fork of this repo instead of the mitocw one. 2019-05-30 13:43:04 -04:00
Dave St.Germain
49b5b88a30 Bumped edx-when 2019-05-30 10:48:38 -04:00
Giulio Gratta
7819a2d5d7 Mark alt text for translation 2019-05-30 07:40:23 -07:00
Giulio Gratta
dddfac8380 Make platform bootstrap footer match other footer 
Changes:
- Add logo back
- Fix up spacing
- Change font sizes and color
 2019-05-30 07:40:23 -07:00
Nimisha Asthagiri
407438970b Merge pull request #20709 from edx/bom/certificates-readme 
README for certificates
 2019-05-29 15:33:03 -04:00
Nimisha Asthagiri
a8e3624d9f Merge pull request #20711 from edx/bom/commerce-readme 
README for commerce and shoppingcart
 2019-05-29 14:12:03 -04:00
Nimisha Asthagiri
54bf50e429 Merge pull request #20707 from edx/depr/microsites-static-template-view 
Remove microsites from static_template_view
 2019-05-29 14:11:38 -04:00
Natalia Berdnikov
8d41aa2ea9 Merge pull request #20687 from eduNEXT/lmm/proctored_translation 
Mark missing string for internationalization
 2019-05-29 12:57:14 -04:00
Nimisha Asthagiri
ad608bea67 Merge pull request #20706 from edx/depr/microsites-shopping-cart 
Remove microsites from shoppingcart
 2019-05-29 11:00:40 -04:00
Nimisha Asthagiri
c0c17601c0 Merge pull request #20705 from edx/depr/microsites-certificates 
Remove microsites from certificates
 2019-05-29 10:58:24 -04:00
Nimisha Asthagiri
feaacef3f3 Remove microsites from static_template_view 
DEPR-28
 2019-05-29 10:38:00 -04:00
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
Nimisha Asthagiri
aee2d36580 Remove microsites from certificates 
DEPR-26
 2019-05-29 03:15:53 -04:00
Nimisha Asthagiri
9e4a98b712 README for commerce and shoppingcart 2019-05-29 03:12:59 -04:00
Nimisha Asthagiri
1118c2bef7 README for certificates 2019-05-29 02:49:41 -04:00
Nimisha Asthagiri
3eb5783f51 Remove microsites from shoppingcart 
DEPR-27
 2019-05-29 02:23:51 -04: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
Luis Moreno
0996cd8642 Mark missing string for internationalization 2019-05-28 15:28:44 -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