Commit Graph

49844 Commits

Author SHA1 Message Date
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
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
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
Matthew Piatetsky
42d551096a fix xss issue for all dashboard redirect messages 2019-05-24 11:34:39 -04:00
Bessie Steinberg
e8c9b55647 Bump edx-enterprise to version 1.5.6 2019-05-24 11:32:10 -04:00
jansenk
65bab28341 add retirement endpoint 2019-05-24 11:29:02 -04:00
Jeremy Bowman
a9cd9de89f TE-2647 Stop running pa11ycrawler (#20682) 2019-05-24 11:02:49 -04:00
Michael Youngstrom
4160cd1310 Add repo as an argument to the notifier (#20678) 2019-05-24 10:44:17 -04:00
edX requirements bot
7ad70cbb3e Updating Python Requirements (#20686) 2019-05-24 09:51: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
edx-pipeline-bot
9336dc48d4 Merge pull request #20685 from edx/private_to_public_79e2911
Mergeback PR from private to public.
2019-05-24 14:25:01 +05:00
Awais Jibran
79e2911449 Merge pull request #152 from edx/fix-user-sync-between-lms-ecom
Fix Elevation in permission over OAuth
2019-05-24 13:35:55 +05:00
Robert Raposa
f47c208f0c Merge pull request #20679 from edx/robrap/fix-remove-ungrouped-imports
fix disable of pylint ungrouped-imports
2019-05-23 19:04:55 -04:00
Feanil Patel
012426acd7 Upgrade gunicorn.
Changelog: http://docs.gunicorn.org/en/stable/2016-news.html
2019-05-23 14:38:16 -04:00
Robert Raposa
e3322da058 fix disable of pylint ungrouped-imports
See https://github.com/edx/edx-platform/pull/20644 for original
attempt at disabling, and more info about why.
2019-05-23 13:44:14 -04:00
Evans Dianga
920ce74877 Modernize INCR-210 user_api/management (#20435) 2019-05-23 13:11:57 -04:00
Wei Lee
1d5a72ac33 INCR-236 (#20502)
* INCR-236

* Run python-modernize on openedx/features/course_duration_limits and
  verify that the change makes sense and tests does not break

* Remove redundant import and update docstring style
2019-05-23 11:53:58 -04:00
Matt Hughes
047c379cab Add endpoint for checking learner program enrollments
JIRA:EDUCATOR-4327
2019-05-23 10:37:13 -04:00
edX requirements bot
8d95595ff7 Updating Python Requirements (#20675) 2019-05-23 10:00:20 -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
Cory Lee
b9c7c10ca7 Merge pull request #20654 from open-craft/jill/cms-worker-grades
SE-1076 Campus.il Fixes issue encountered when cms worker updates grades
2019-05-23 09:39:29 -04:00