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

50195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
uzairr
789a48e27b Update enrollment support view 
Currently, entitlement view is not displaying any message if there
are no records against a query.To improve user experience, changes
have been made so that a proper message would be displayed.

LEARNER-7155
 2019-06-27 14:48:05 +05:00
uzairr
575589f8a5 Python-modernize on edx-platform (369 of 380) 2019-06-27 13:21:50 +05:00
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
usama sadiq
7a5f0b7d24 Pylint Warning Supression Removed 2019-06-27 12:15:06 +05:00
usama sadiq
23b2039c87 Python3 Update 
Added future absolute_import
changed unicode() with six.text_type()
 2019-06-27 12:15:06 +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