Commit Graph

49825 Commits

Author SHA1 Message Date
Brittney Exline
ade50c1baf Reverting ENT-1054 2019-05-27 12:40:46 -06: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
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
Feanil Patel
defba08aa3 Merge pull request #20670 from edx/feanil/oep2-compliance
Become oep2 compliant.
2019-05-22 17:14:59 -04:00
Awais Jibran
da1c2a119b Fix Elevation in permission over OAuth 2019-05-23 02:12:00 +05:00
edX Transifex Bot
054279d6d0 geoip2: update maxmind geolite country database 2019-05-22 17:08:37 -04:00
Jeremy Bowman
7df3c20828 Update handling of URL-based dependencies (#20666) 2019-05-22 15:54:47 -04:00
Jeremy Bowman
64e7c46cf5 Remove flaky tab reordering test (#20629) 2019-05-22 15:52:58 -04: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
Feanil Patel
b92cab9a0a Become oep2 compliant. 2019-05-22 15:34:03 -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
Ned Batchelder
752b3072c4 Fix CSSlint issues 2019-05-22 13:03:20 -04:00
edX requirements bot
7177d55f73 Updating Python Requirements (#20664) 2019-05-22 10:12:04 -04:00
Dave St.Germain
1c538a3ab8 Merge pull request #20659 from edx/dcs/update-when
Update edx-when to 0.1.5
2019-05-22 09:54:21 -04:00
Muhammad Ammar
6b37cbe44f Merge pull request #20663 from edx/ammar/update-edx-enterprise-version
update edx-enterprise version
2019-05-22 16:27:04 +05:00
muhammad-ammar
29ae9f1736 update edx-enterprise version
ENT-1885
2019-05-22 13:27:05 +05:00