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

49863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
emma-green
8615b1b0ac Merge pull request #20661 from edx/emma-green/REVEM-355/add-arch-decision 
add arch decision of computation of course-user discount
 2019-05-29 12:08:21 -04:00
edX cache uploader bot
97c8c176a6 Updating Bokchoy testing database cache (#20715) 2019-05-29 11:43:06 -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
Nimisha Asthagiri
5c3dbaa588 Merge pull request #20708 from edx/depr/microsites-user_authn 
Remove microsites from user_authn
 2019-05-29 10:30:33 -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
Emma Green
95c15495dd add arch decision of computation of course-user discount 2019-05-29 10:21:46 -04:00
edX cache uploader bot
b4df3a10f4 Updating Bokchoy testing database cache (#20713) 2019-05-29 09:55:53 -04:00
Zia Fazal
34777350d4 Merge pull request #20712 from edx/ziafazal/WL-1927 
Bumped edx-enterprise version and added cornerstone app
 2019-05-29 15:11:21 +05: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
3eb5783f51 Remove microsites from shoppingcart 
DEPR-27
 2019-05-29 02:23:51 -04:00
Nimisha Asthagiri
5b29672ed1 Remove microsites from user_authn 
DEPR-30
 2019-05-29 02:20:42 -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
Nimisha Asthagiri
d3b79ae5f7 README for enrollments app 2019-05-28 15:28:15 -04:00
Nimisha Asthagiri
9127075bcf Fix Pylint for enrollments 2019-05-28 13:25:02 -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
George Babey
6eae77cf2e Merge pull request #20696 from edx/bexline/revert_ent1054 
Reverting ENT-1054
 2019-05-28 08:45:00 -04:00
Syed Muhammad Dawoud Sheraz Ali
d73b600374 Merge pull request #20699 from edx/dsheraz/email-logging-2 
update email subtask logs
 2019-05-28 17:38:54 +05:00
DawoudSheraz
831a106bfa update email subtask logs 2019-05-28 16:53:24 +05:00
Usama Sadiq
800a7bcf7c Merge pull request #20695 from edx/usama/learner-7318-MathJax-Output-Format-in-Studio 
MathJax Output Format update in Studio
 2019-05-28 15:10:41 +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
Brittney Exline
ade50c1baf Reverting ENT-1054 2019-05-27 12:40:46 -06:00
usama sadiq
db19e06047 MathJax Output Format update in Studio 
Changed the MathJax output format
from SVG to HTML in Studio side.
 2019-05-27 15:55: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
aliciaerwin
ddeb7c4204 INCR-237 Run python modernize on openedx/tests (#20494) 2019-05-24 15:46:18 -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
Jeremy Bowman
c1c4cf5bf7 Remove more unused pa11ycrawler code (#20690) 2019-05-24 15:22:08 -04:00
Feanil Patel
92c24c723b Merge pull request #20680 from edx/feanil/update_gunicorn 
Upgrade gunicorn.
 2019-05-24 14:38:38 -04:00
Amit
9c9f38e4e9 INCR-251: Make compatible with Python 3.x without breaking Python 2.7 support --> common/test/acceptance/tests/discussion (#20646) 2019-05-24 14:20:03 -04:00
Nimisha Asthagiri
432a3d0f3e Merge pull request #20691 from edx/arch/dont-update-lms-from-jwt 
Prevent JWT Authentication from updating LMS User Data
 2019-05-24 13:57:18 -04:00
Zach Hancock
a350d327de complete waiting enrollments. fixed 2019-05-24 13:47:49 -04:00
Matthew Piatetsky
936f94cfb4 fix issue for all dashboard redirect messages (#20689) 
fix issue for all dashboard redirect messages
 2019-05-24 12:32:06 -04:00
Nimisha Asthagiri
1ebecef5ed Prevent JWT Authentication from updating LMS User Data 2019-05-24 12:24:05 -04:00
Bessie Steinberg
3539f03a20 Merge pull request #20688 from edx/bessiesteinberg/bump-edx-enterprise-1.5.6 
Bump edx-enterprise to version 1.5.6
 2019-05-24 12:14:35 -04:00