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

50235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
arbisoft
32e89b48bc Fixing python-modernize issues. 2019-07-09 16:25:08 +05:00
Zia Fazal
9d856c4cec Merge pull request #20973 from edx/ziafazal/WL-1946 
Bumped edx-enterprise version
 2019-07-09 12:44:03 +05:00
Aarif
831be7d7e6 Merge pull request #20963 from mraarif/INCR-319 
INCR-319 - python 3 compatibility
 2019-07-09 12:03:24 +05:00
Ayub
7291d8409b Merge pull request #20961 from Ayub-Khan/INCR-320 
INCR-320 python 3 compatibility
 2019-07-09 12:01:43 +05:00
Awais Qureshi
a566c0a05f Merge pull request #20960 from awais786/awais786/INCR-321 
INCR-321 python3 compatibilty
 2019-07-09 11:55:27 +05:00
Zia Fazal
98bfd092ce Bumped edx-enterprise version 2019-07-09 11:47:37 +05:00
Usama Sadiq
88a574b14c Merge pull request #20965 from edx/usama/INCR-468 
INCR-468
 2019-07-09 11:42:41 +05:00
Andytr1
aec8c0057f Merge pull request #20968 from edx/andytr1/grade-override-update-sorting 
updated sorting
 2019-07-08 15:23:00 -04:00
Brian Mesick
e462b0b824 Merge pull request #20741 from edx/pwnage101/add-history-to-courseoverviews 
Add history to CourseOverview
 2019-07-08 14:46:55 -04:00
atesker
b553501c5d updated sorting 2019-07-08 14:45:54 -04:00
Amit
2c8c3b8a74 INCR-469: Updates on Python 3.x, disable: import-error and fix line over length (#20962) 2019-07-08 13:57:26 -04:00
Matt Hughes
42a986cb97 Merge pull request #20940 from edx/matthugs/add-grade-bulk-management-history-endpoint 
LMS bulk grade endpoint hygiene & CSM key exhaustion updates
 2019-07-08 13:39:02 -04:00
Matt Hughes
1da56ac768 Add endpoint for history of bulk management operations to LMS 
JIRA:EDUCATOR-4367
 2019-07-08 13:09:59 -04:00
Jillian Vogel
44562a1592 SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742) 
Inlines all 36 discussion underscore templates

imported by lms/templates/discussion/_underscore_templates.html
to reduce file system load when displaying inline discussion blocks.

Ignored error where fix required changing the translated text string,
due to differences between underscore and HtmlUtils format strings.
 2019-07-08 11:26:43 -04:00
Ayub khan
9fb5c146e8 -python 3 compatibility 2019-07-08 20:02:10 +05:00
Zachary Hancock
b6b04a4551 sync courses command (#20946) 2019-07-08 10:45:36 -04:00
usama sadiq
eef3b65535 Python3 Update 
Added future absolute_import
Changed unicode() with six.text_type()
 2019-07-08 19:41:58 +05:00
Andytr1
e8ca657d78 Merge pull request #20943 from edx/andytr1/grade-override-history-limit-and-simple-history-tweaks 
EDUCATOR-4353 updated history override backend
 2019-07-08 09:05:33 -04:00
atesker
b1e8dbe2d4 EDUCATOR-4353 updated history override backend 
unit test fixes

code review comments
 2019-07-08 08:35:16 -04:00
root
0f22c9ff9b python 3 compatibility 2019-07-08 12:16:46 +00:00
arbisoft
ebcd75965b python3 compatibilty 2019-07-08 16:25:58 +05:00
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
Troy Sankey
4500536151 Add history to CourseOverview 2019-07-03 16:24:28 -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