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

50128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
amitvadhel
b6b1b0c602 INCR-473: Make compatible with Python 3.x 2019-06-23 13:29:43 +03:00
Ned Batchelder
b3a731550c Fix problems that drf-yasg uncovered. 
These were originally fixed individually, but had to be reverted, and
are now combined in one commit.  The originals were:

7b9040f6b0 This enum was backwards
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same.
8a44397139 Is this field missing because it is None?
4a1154a7ca Give a safer buffer for clearing the rate limiting
64c47856dd DRF 3.7.4 changed how you delegate to another view, so don't
7359ca4fb2 Is this right? It fixes two tests
fdd66e5390 Adjust the expected error message for DRF 3.7.7
9257f68fd8 The default TIME_ZONE should be UTC
 2019-06-21 18:04:15 -04:00
Ned Batchelder
6da0d5bf92 Un-truncate test failure diffs 
(cherry picked from commit de8e158ce8)
 2019-06-21 17:59:05 -04:00
Ned Batchelder
e0c4205b45 make upgrade 2019-06-21 17:56:55 -04:00
Ned Batchelder
2e9cae46cb Add drf-yasg 
* Install drf-yasg

* Add drf-yasg settings and urls

* Pin drf to make drf-yasg work

* Adjust config-models version to be compatible

* Remove django-rest-swagger (the old way)
 2019-06-21 17:47:26 -04:00
Calen Pennington
14f7b90fb8 Merge pull request #20872 from cpennington/track-selection-not-enrolled 
Add metrics and logging around track selection rendering without enro…
 2019-06-21 15:42:25 -04:00
Douglas Hall
f9d599a1a0 Add Discover New link to LMS header. (#20875) 2019-06-21 15:41:06 -04:00
jansenk
027a9bd2cc add api access request management command 2019-06-21 15:34:03 -04:00
stv
488e4e1e02 Remove local copy of openedx-chem package 
now that we install it from an external repository.
 2019-06-21 11:49:31 -07:00
stv
0e951950de Install openedx-chem package from Github 
instead of localhost
 2019-06-21 11:49:26 -07:00
Stu Young
16fcf22a7c bump code annotations (#20869) 2019-06-21 13:56:49 -04:00
Calen Pennington
e37e7e67fb Add metrics and logging around track selection rendering without enrollment 2019-06-21 13:15:14 -04:00
Calen Pennington
b14244fe01 Merge pull request #20862 from cpennington/mobile-fbe-fields 
Allow a limited subset of fields in the Course Block View for blocks …
 2019-06-21 12:25:56 -04:00
Manjinder Singh
a787cd51cf Merge pull request #20801 from edx/msingh/INCR-482 
INCR-482: ran python modernization and isort
 2019-06-21 11:10:37 -04:00
Andytr1
cac4ec0047 Merge pull request #20843 from edx/andytr1/grades_show_email_for_masters_track_only 
EDUCATOR-4319 gradebook show student email only for master's track.
 2019-06-21 09:29:58 -04:00
Hammad Ahmad Waqas
63d7b7d6fa applying filter to remove dangerous html content before rendering in 
course_about page on course overview field
 2019-06-21 16:06:26 +05:00
Amit
df949d6de1 INCR-480: Make compatible with Python 3.x and fixed line over length limit (#20833) 2019-06-20 16:20:49 -04:00
Amit
4fb5679987 INCR-245: Make compatible with Python 3.x without breaking Python 2.7… (#20530) 
* INCR-245: Make compatible with Python 3.x without breaking Python 2.7 support > common/lib/capa/capa/safe_exec

* INCR-245: Add absolute_import to CODE_PROLOG
 2019-06-20 15:38:33 -04:00
Calen Pennington
093fc9f68a Allow a limited subset of fields in the Course Block View for blocks that have been denied authorization 2019-06-20 15:23:32 -04:00
atesker
68ec2e184d gradebook show student email only for master's track. 
gradebook show student email only for master's track.

show emails for masters track - unit tests pass

fixed more unit tests and linting
 2019-06-20 14:51:38 -04:00
edX cache uploader bot
23196519b3 Updating Bokchoy testing database cache (#20863) 2019-06-20 11:35:39 -04:00
edX requirements bot
a8310f34c7 Updating Python Requirements (#20860) 2019-06-20 11:29:46 -04:00
Hassan
e6fc882cee Merge pull request #20847 from edx/hassan/add-history-to-coursemode 
Added history to CourseMode.
 2019-06-20 19:49:02 +05:00
Hassan Javeed
6d14f288e5 Added history to CourseMode 
DE-1557
 2019-06-20 19:04:26 +05:00
msingh
403a04b9fa Removing flacky test from test_lms_problems.py 2019-06-20 09:25:40 -04:00