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

49802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
c1a2a60200 CMS files reverted to original settings 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
Andytr1
1cfc6738cf Merge pull request #20631 from edx/andytr1/proctored_report 
EDUCATOR-4290 support for provider and track
 2019-05-21 15:54:45 -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
Stu Young
c33bd1c643 INCR-262 Run python-modernize on lms/djangoapps/certificates/migrations and lms/djangoapps/certificates/views (#20558) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:32:51 -04:00