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

50213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edX Transifex Bot
dc9974cede fix(i18n): update translations 2019-07-08 04:06:37 -04:00
edX cache uploader bot
f0d1d39135 Updating Bokchoy testing database cache (#20952) 2019-07-05 12:28:09 -04:00
Cory Lee
de7486e589 Merge pull request #20873 from edx/coryleeio/drop_csm_fk 
Drop CSM FK on history
 2019-07-05 11:49:15 -04:00
Cory Lee
09bc3c0714 Add CSM drop FK migration 2019-07-05 11:02:09 -04:00
Cory Lee
6ee9b0bcab Drop CSM FK on history 2019-07-05 11:02:09 -04:00
Calen Pennington
566cd9775d Merge pull request #20936 from cpennington/discount-holdback 
Discount holdback
 2019-07-05 10:06:40 -04:00
adeel khan
3987a17a00 Merge pull request #20950 from edx/adeel/part1b_fix_templates 
Fix templates issues
 2019-07-05 14:46:06 +05:00
Adeel Khan
a44d3e7a75 Fix templates for xss. 
PROD-465
 2019-07-05 12:39:58 +05:00
edX Transifex Bot
07b83294d8 geoip2: update maxmind geolite country database 2019-07-03 17:03:04 -04:00
Calen Pennington
708118f9c0 Enable holdback in first purchase discounts 2019-07-03 15:23:34 -04:00
Calen Pennington
8b4b5a4547 Move stable_bucketing into its own library to minimize circular dependencies 2019-07-03 15:03:31 -04:00
edX requirements bot
7fb4367b5b Updating Python Requirements (#20941) 2019-07-03 13:21:27 -04:00
adeel khan
9388f2d6ae Merge pull request #20926 from edx/adeel/part1a_xss_vulnerability 
Fix Template Issues
 2019-07-03 20:32:06 +05:00
Adeel Khan
ef0d56aac6 Fix lms templates to prevent xss attacks. 
This patch is part of multiple PR's.

LEARNER-4632
 2019-07-03 19:57:59 +05:00
Dave St.Germain
b4649edf12 Merge pull request #20927 from edx/dcs/repo-pypi 
Moved these packages to pypi
 2019-07-03 10:41:11 -04:00
Dave St.Germain
5c7ae14e50 Moved these packages to pypi 2019-07-03 09:54:53 -04:00
Zainab Amir
f6603cb8cf Update verification expiry email criteria (#20725) 
If already DEFAULT Number of emails are sent, then verify that user
is enrolled in at least one verified course run for which the course
has not ended else stop sending emails

LEARNER-7313
 2019-07-03 14:19:22 +05:00
Amit
7dfb73c7a6 INCR-483: Make compatible with Python 3.x without breaking Python 2.7 support (#20795) 
* reword INCR-483: Make compatible with Python 3.x without breaking Python 2.7 support

pick INCR-483: Re-run isort for lms/envs/test.py

INCR-483: change import order

INCR-483: PyLint fixes

* INCR-483: Fixes useless suppression

* INCR-483: Remove unused get_swagger_view
 2019-07-02 12:54:34 -04:00
Feanil Patel
b0fcf3c4fa Merge pull request #20934 from edx/jenkins/upgrade-python-requirements-17975d0 
Python Requirements Update
 2019-07-02 10:51:12 -04:00
Feanil Patel
b686368f1d Merge pull request #20914 from amitvadhel/INCR-467 
INCR-467: Updates on Python 3.x
 2019-07-02 09:59:37 -04:00
Feanil Patel
269093c80a Merge pull request #20932 from edx/feanil/pin_to_minor_instead_of_exact_patch 
Don't pin Django to a patch version.
 2019-07-02 09:38:29 -04:00
edX requirements bot
c348ebefea Updating Python Requirements 2019-07-02 06:47:13 -04:00
Syed Muhammad Dawoud Sheraz Ali
17975d0f57 Merge pull request #20925 from edx/dsheraz/prod-442 
refactor the login user method
 2019-07-02 14:08:44 +05:00
DawoudSheraz
b15f923c47 refactor the login user method 2019-07-02 13:12:03 +05:00
Feanil Patel
e055de3218 Merge pull request #20933 from edx/feanil/upgrade_matplotlib 
Update the version of matplotlib running in sandboxes.
 2019-07-01 15:59:25 -04:00
Feanil Patel
644bb41b87 Update the version of matplotlib running in sandboxes. 
Changelog can be found here: https://matplotlib.org/1.5.3/users/whats_new.html

This version fixes the odd setup.py in matplotlib that tries to install
numpy as a part of matplotlib setup.py execution.

Looking at the changelog I don't see any incompatibility issues just bug
fixes and feature additions.
 2019-07-01 15:20:55 -04:00
Feanil Patel
0329f7a2a2 Don't pin Django to a patch version. 
Pin to the minor version so that we can get patches via the update
automation.  Since Django is pretty good at SemVer we can rely on these
to be pretty safe and it will speed up our security update process when
Django releases new security patches.
 2019-07-01 15:01:21 -04:00
Feanil Patel
3c220d11da Merge pull request #20930 from edx/feanil/django_security_update 
Update django version.
 2019-07-01 11:53:39 -04:00
edX cache uploader bot
4770a1487e Updating Bokchoy testing database cache (#20924) 2019-07-01 11:30:46 -04:00
Zachary Hancock
0ed2e67c2b site configuration management (#20919) 
site config management cmd
 2019-07-01 11:07:26 -04:00
Feanil Patel
b9bb7a4660 Update django version. 2019-07-01 10:50:42 -04:00
emma-green
7f467075ad Merge pull request #20916 from edx/emma-green/remove-discount-banner-display-flag 
remove discount banner display flag
 2019-07-01 10:38:42 -04:00
Feanil Patel
0ccbd23d02 Merge pull request #20918 from amitvadhel/INCR-465 
INCR-465: Updates on Python 3.x and disable: import-error
 2019-07-01 10:37:01 -04:00
Feanil Patel
d84ba077b2 Merge pull request #20921 from edx/jenkins/upgrade-python-requirements-25b9d47 
Python Requirements Update
 2019-07-01 09:57:00 -04:00
jansenk
4c93bcbf8f Add put endpoint for program enrollments, rework program enrollment view 2019-07-01 09:33:30 -04:00
adeelehsan
46ffa0103d Merge pull request #20439 from edx/aehsan/prod-204/learners_seeing_504_error 
Flag added to load limited courses on Dashboard
 2019-07-01 13:01:21 +05:00
edX Transifex Bot
a5629bff89 fix(i18n): update translations 2019-07-01 03:59:40 -04:00
edX requirements bot
d4f0bcc570 Updating Python Requirements 2019-06-30 06:49:05 -04:00
amitvadhel
80715c80f6 INCR-465: Updates on Python 3.x and disable: import-error 2019-06-28 22:08:53 +03:00
Emma Green
c4ae093e75 remove discount banner display flag 2019-06-28 14:46:21 -04:00
adeelehsan
2d369490dd Flag added to load limited courses on Dashboard 
Dashboard is set to load 250 courses instead of
all the courses. A flag is also added to change
the number the courses to load.

PROD-204
 2019-06-28 22:51:41 +05:00
Dave St.Germain
25b9d4791e Merge pull request #20917 from edx/dcs/sgp-setting 
Fixed SGP setting
 2019-06-28 10:32:34 -04:00
Michael Youngstrom
139cdb8ba2 Switch testing from ecs to ec2 (#20846) 2019-06-27 22:04:02 -04:00
Dave St.Germain
f4d65219fb Fixed SGP setting 2019-06-27 16:43:34 -04:00
Feanil Patel
c5b86eb5c7 Merge pull request #20384 from open-craft/symbolist/video-xblock 
VideoModule to VideoBlock [SE-602]
 2019-06-27 16:23:00 -04:00
Uzair Rasheed
c3af0ed3f1 Merge pull request #20848 from edx/LEARNER-7155/update-entitlement-support-view 
Update enrollment support view
 2019-06-28 00:11:10 +05:00
amitvadhel
06582d5972 INCR-467: Updates on Python 3.x 2019-06-27 21:46:03 +03:00
adeelehsan
72c5cb09e3 Merge pull request #20889 from edx/aehsan/INCR-471 
Python3 update
 2019-06-27 19:17:53 +05:00
Usama Sadiq
7920d2cb91 Merge pull request #20888 from edx/usama/INCR-470 
INCR-470
 2019-06-27 18:53:26 +05:00
Uzair Rasheed
4c7ca41063 Merge pull request #20908 from edx/INCR-472/python-modernize-369-of-380 
Python-modernize on edx-platform (369 of 380)
 2019-06-27 18:32:37 +05:00