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

50157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
adeel khan
da2eb46fcc Merge pull request #20907 from edx/adeel/wiki_template_fix 
Fixes template for incorrect trans escaping.
 2019-06-27 12:22:17 +05:00
Adeel Khan
9e53071ef0 Fixes template for incorrect trans escaping. 2019-06-27 11:40:43 +05:00
edX Transifex Bot
540dd815e6 geoip2: update maxmind geolite country database 2019-06-26 17:08:18 -04:00
Feanil Patel
f6ba30f896 Merge pull request #20844 from edx/renovate/edx-studio-frontend-1.x 
Update dependency @edx/studio-frontend to v1.16.17
 2019-06-26 15:17:14 -04:00
Feanil Patel
729495e1aa Merge pull request #20871 from amitvadhel/INCR-475 
Incr 475
 2019-06-26 14:51:15 -04:00
Feanil Patel
615b9c7dae Merge pull request #20868 from amitvadhel/INCR-474 
Incr 474
 2019-06-26 14:17:09 -04:00
Feanil Patel
97c8c831bf Merge pull request #20902 from edx/jenkins/upgrade-python-requirements-e8576d2 
Python Requirements Update
 2019-06-26 14:12:07 -04:00
Feanil Patel
5531edd363 Prevent this from getting accidentally deleted in pip. 2019-06-26 13:34:09 -04:00
Andytr1
f558c8a821 Merge pull request #20898 from edx/andytr1/grades_show_override_history 
EDUCATOR-4353 - backend - send simple history via api
 2019-06-26 10:35:57 -04:00
atesker
c99e4ebb80 backend - send simple history via api 
EDUCATOR-4353 code review comments
 2019-06-26 10:01:12 -04:00
Uzair Rasheed
88835c3cc4 Merge pull request #20865 from edx/INCR-478/python-modernize-375-of-380 
Python-modernize on edx-platform (375 of 380)
 2019-06-26 18:57:12 +05:00
Christie Rice
3415824451 REVMI-280 Add course name and announcement to message (#20895) 2019-06-26 09:23:33 -04:00
edX requirements bot
77e6112b84 Updating Python Requirements 2019-06-26 06:50:35 -04:00
Usama Sadiq
e8576d2bd1 Merge pull request #20864 from edx/usama/INCR-479 
INCR-479
 2019-06-26 11:48:14 +05:00
usama sadiq
d2c78b7734 Update to Python3 
Added the import statements
 2019-06-26 11:18:51 +05:00
Usama Sadiq
0105e7bdce Merge pull request #20866 from edx/usama/INCR-481 
INCR-481
 2019-06-26 11:12:29 +05:00
Simon Chen
d48ba26d50 Update LMS API to send correct response status code 2019-06-25 19:40:42 -04:00
Calen Pennington
39efc54a27 Merge pull request #20884 from cpennington/discount-no-previous-purchase 
REVEM-289: Discount no previous purchase
 2019-06-25 17:12:19 -04:00
Calen Pennington
f07f2121ba Make has_non_audit_enrollments exclude entitlements 2019-06-25 16:44:36 -04:00
Calen Pennington
388fac3b9c Make has_non_audit_enrollments exclude honor courses correctly 2019-06-25 16:44:36 -04:00
Douglas Hall
0f045ab5db Add analytics tracking to Discover New header link. (#20896) 2019-06-25 16:36:59 -04:00
Feanil Patel
52a5c81589 Merge pull request #20883 from amitvadhel/INCR-459 
INCR-459: Run python-modernize and isort
 2019-06-25 15:20:18 -04:00
Feanil Patel
81f6a0c056 Run npm install on version 5.5.1 to make sure quality tests pass. 2019-06-25 15:15:49 -04:00
Renovate Bot
97f9f3d7f3 Update dependency @edx/studio-frontend to v1.16.17 2019-06-25 15:15:31 -04:00
Simon Chen
a86e8d4f19 EDUCATOR-4361 Add PUT api endpoint to the edx-plaform program course enrollment view 2019-06-25 15:12:22 -04:00
Feanil Patel
de20d7414c Merge pull request #20400 from stvstnfrd/split-core/chem 
Split common/lib/chem into separate repository
 2019-06-25 14:45:35 -04:00
Ned Batchelder
aa13a634a6 Merge pull request #20821 from edx/nedbat/drf-yasg 
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
 2019-06-25 13:49:13 -04:00
Feanil Patel
72f258b7c1 Merge pull request #20855 from edx/feanil/unpin_gunicorn 
Unpin gunicorn.
 2019-06-25 13:44:28 -04:00
Feanil Patel
0af26561b2 Merge pull request #20876 from amitvadhel/INCR-473 
INCR-473: Make compatible with Python 3.x
 2019-06-25 12:57:02 -04:00
Calen Pennington
ce058aa5ee Only allow users who have no entitlements to receive discounts 2019-06-25 12:04:59 -04:00
Calen Pennington
ac9ba2b95a Only make users who haven't previously enrolled in a non-upsellable course eligible for the discount 2019-06-25 12:04:59 -04:00
Calen Pennington
390122ec93 Make CourseOverviewFactory create new courses every time (unless otherwise specified) 2019-06-25 12:04:59 -04:00
Nadeem Shahzad
441d2e44b9 Merge pull request #20818 from edx/nadeem/OPS-4041 
Defaults to common.py lms (OPS-4041)
 2019-06-25 18:47:12 +05:00
nadeemshahzad
993a21181a defaults to common.py 2019-06-25 13:01:29 +00:00
adeel khan
94c3b4ee5a Merge pull request #20633 from edx/adeel/part1_xss_vulnerability 
Fix templates for XSS code injection via translations
 2019-06-25 15:20:12 +05:00
Adeel Khan
298d3554fe Fix templates for XSS code injection via translations 
This would patch all templates (django/mako)
for a possible XSS code injection via
translation files by html escaping them..

LEARNER-4632
 2019-06-25 14:22:42 +05:00
Hammad Ahmad Waqas
34589393ac Merge pull request #20840 from edx/hammad/WL-1492 
WL-1492 | Remove arbitrary code rendering on course about page
 2019-06-25 11:20:07 +05:00
Matt Tuchfarber
e4430b0dfb Merge pull request #20882 from edx/tuchfarber/add_site_check_to_consent 
Check if enterprise matches site before consent
 2019-06-24 15:43:28 -04:00
Matt Tuchfarber
4e1877670e Check if enterprise matches site before consent 
We don't support enterprises with catalogs that span sites, so we can
safely ignore checking for consent when the site a learner is viewing a
course in is different than the enterprise that the learner is linked
to.
 2019-06-24 14:30:59 -04:00
Dave St.Germain
5f838da9be Merge pull request #20881 from edx/dcs/prod-344 
Ensure that exam due dates reflect course pacing
 2019-06-24 14:26:30 -04:00
amitvadhel
8a01c9b0a5 INCR-459: Run python-modernize and isort 2019-06-24 21:20:19 +03:00
Jeremy Bowman
50a2641e1c Remove flaky problem reset tests (#20870) 2019-06-24 13:20:50 -04:00
Dave St.Germain
15921ebe65 Ensure that exam due dates reflect course pacing 2019-06-24 12:03:50 -04:00
Christie Rice
eeb265e276 REVEM-376 Disable waffle flags by default (#20880) 2019-06-24 11:31:10 -04:00
Manjinder Singh
eb5e44c2d1 Merge pull request #20841 from edx/msingh/removing_flacky_test 
Removing flaky tests
 2019-06-24 11:10:23 -04:00
Christie Rice
b8401beaae REVEM-374 Remove course prices from dashboard (#20856) 2019-06-24 08:56:05 -04:00
Mushtaq Ali
07addf5f22 Merge pull request #20853 from edx/mushtaq/fix-csrf-referer-not-trusted 
Add CSRF_TRUSTED_ORIGINS settings
 2019-06-24 16:18:10 +05:00
Syed Muhammad Dawoud Sheraz Ali
257406b25b Merge pull request #20859 from edx/dsheraz/prod-136 
remove staff exemption from the library_content transformer
 2019-06-24 11:33:55 +05:00
DawoudSheraz
b37e679c39 remove staff exemption from the library_content transformer 2019-06-24 11:05:11 +05:00
edX Transifex Bot
b824f583c5 fix(i18n): update translations 2019-06-23 17:22:25 -04:00