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

50431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
e51fae3784 letters doesn't exist in python 3.6 
Use `ascii_letters` instead which is a reasonable alternative for our
usecases.
 2019-07-19 09:48:10 -04:00
Michael Youngstrom
4d1a320fa0 Add Vars to tox that are needed to get tests to start running. 2019-07-19 09:48:10 -04:00
Syed Muhammad Dawoud Sheraz Ali
f293b74fca Merge pull request #21148 from edx/dsheraz/educator-4499 
add submission deadline methods in InheritanceMixin
 2019-07-19 16:32:29 +05:00
DawoudSheraz
7131809fec add submission deadline methods in InheritanceMixin 2019-07-19 16:06:06 +05:00
Awais Qureshi
6edf9766df Merge pull request #21134 from edx/awais786/INCR-443 
INCR-443
 2019-07-19 13:46:34 +05:00
Awais Qureshi
3d2e0f7dde Merge pull request #21133 from edx/awais786/INCR-445 
INCR-445
 2019-07-19 13:44:38 +05:00
Ayub
10df92857f Merge pull request #21035 from edx/INCR-380 
INCR-380 python 3 compatibility
 2019-07-19 12:25:43 +05:00
Ayub
8da4955ea9 Merge pull request #21034 from edx/INCR-379 
INCR-379 python 3 compatibility
 2019-07-19 12:25:06 +05:00
Ayub
ef1da0f007 Merge pull request #21032 from edx/INCR-377 
INCR-377 python 3 compatibility
 2019-07-19 12:24:25 +05:00
Awais Qureshi
3ed1399216 Merge pull request #21065 from edx/awais786/INCR-398 
INCR-398
 2019-07-19 11:33:43 +05:00
Muhammad Zaid Bamber
cc985a407b Merge pull request #20793 from edx/zaid-prod-250 
Fixed CDN urls to Static urls on edit.
 2019-07-18 18:53:59 +05:00
zaidbamber161
d3b1fd24f7 Fixed CDN urls to Static urls. 2019-07-18 17:48:00 +05:00
Awais Qureshi
af50c3c043 Merge pull request #21063 from edx/awais786/INCR-397 
INCR-397
 2019-07-18 14:34:43 +05:00
Aarif
a806a7f046 Merge pull request #21042 from edx/INCR-387 
INCR-387 Python 3 compatibility
 2019-07-18 13:14:10 +05:00
Aarif
d0a73e7f1a Merge pull request #21037 from edx/INCR-382 
INCR-382 Python 3 compatibility
 2019-07-18 13:13:47 +05:00
Awais Qureshi
8b278f3ac2 Merge pull request #21062 from edx/awais786/INCR-395 
INCR-395
 2019-07-18 12:19:30 +05:00
Awais Qureshi
288195e1be Merge pull request #21060 from edx/awais786/INCR-394 
INCR-394
 2019-07-18 12:15:37 +05:00
Ayub
c3ad8a2f48 Merge pull request #21030 from edx/INCR-376 
INCR-376 python3 compatibility
 2019-07-18 12:09:29 +05:00
Ayub
e324ccaf7e Merge pull request #21028 from edx/INCR-375 
INCR-375 python3 comptatibility
 2019-07-18 11:19:00 +05:00
Ayub
9e3d66f3d4 Merge pull request #21025 from edx/INCR-366 
INCR-366 python3 compatibility
 2019-07-18 11:17:49 +05:00
edX Transifex Bot
30ec66e988 geoip2: update maxmind geolite country database 2019-07-17 16:52:32 -04:00
Dave St.Germain
bfdb4f6c4d Merge pull request #21154 from edx/dcs/upgrade 
Make upgrade
 2019-07-17 15:30:31 -04:00
Dave St.Germain
e56f90a767 Make upgrade 2019-07-17 15:01:43 -04:00
Alex Dusenbery
ba2f0725ee EDUCATOR-4498 | Add optional output-file option to generate_jwt_signing_key command. 2019-07-17 14:45:25 -04:00
Feanil Patel
ad2444204a Deal with xss linter. 2019-07-17 12:26:21 -04:00
Feanil Patel
a781523c91 Convert what's left of pavelib. 2019-07-17 12:26:21 -04:00
Stu Young
10d583fe4e add pytest decorator for skipping py3 test (#21151) 
* add pytest decorator for skipping py3 test

* quality
 2019-07-17 12:09:01 -04:00
Kyle McCormick
35d88ae0e2 Load COURSE_CATALOG_API_URL setting from env in Studio 2019-07-17 11:05:44 -04:00
David Ormsbee
a712f1f93b Remove full table scan of VerificationDeadline. (#21119) 
* Remove full table scan of VerificationDeadline.

Before this commit, we were doing a full table scan of
student_verificationdeadline, loading the results into a giant
dict, and reading/writing that to the cache. This was fine when the
code was introduced and there were dozens of courses, but now that
we're over 12K courses, it's becoming a major performance issue for
the Student Dashboard.

This uses a subquery to the course enrollment table so that we're
only ever pulling back the deadlines to a student's enrolled courses
for any given request. It removes the cache access entirely.
 2019-07-17 10:25:08 -04:00
Awais Qureshi
f88bb74550 Merge pull request #21048 from edx/awais786/INCR-392 
INCR-392
 2019-07-17 18:57:16 +05:00
Ayub
08e793147d Merge pull request #21040 from edx/INCR-388 
INCR-388 python3 compatibility
 2019-07-17 18:56:28 +05:00
Awais Qureshi
281bf3e487 Merge pull request #21044 from edx/awais786/INCR-389 
INCR-389
 2019-07-17 18:51:57 +05:00
Aarif
5e7f39efa8 Merge pull request #21027 from edx/INCR-367 
INCR-367 Python 3 compatibility
 2019-07-17 14:33:27 +05:00
Aarif
d4a246ae93 Merge pull request #21029 from edx/INCR-371 
INCR-371 Python 3 compatibility
 2019-07-17 13:23:18 +05:00
Ayub
79872f54d9 Merge pull request #21019 from edx/INCR-355 
INCR-355 python3 compatibility
 2019-07-17 13:10:59 +05:00
Nadeem Shahzad
df127e8b87 Merge pull request #20901 from edx/nadeem/OPS-4042 
Defaults to common.py CMS (OPS-4042)
 2019-07-17 12:48:38 +05:00
Awais Qureshi
6f3680ced5 Merge pull request #21039 from edx/awais786/INCR-383 
INCR-383
 2019-07-17 12:22:37 +05:00
Awais Qureshi
f040d22e6a Merge pull request #21031 from edx/awais786/INCR-372 
INCR-372
 2019-07-17 12:06:13 +05:00
nadeemshahzad
4a93420946 defaults to common.py CMS 2019-07-17 12:04:20 +05:00
Ayub khan
8dfba01f14 INCR-355 python3 compatibility 2019-07-17 12:02:31 +05:00
Ayub
ed4be76dfd Merge pull request #21022 from edx/INCR-362 
INCR-362 python3 compatability
 2019-07-17 10:47:33 +05:00
Ayub
be92bba430 Merge pull request #21020 from edx/INCR-361 
INCR-361 python3 compatibility
 2019-07-17 10:46:42 +05:00
Feanil Patel
287b5166b6 Limit ruamel.ordereddict to python 2.7. (#21142) 2019-07-16 14:41:12 -04:00
Amit
b8b910d132 INCR-460: Make compatible with Python 3.x and disable: import-error f… (#20989) 
* INCR-460: Make compatible with Python 3.x and disable: import-error for urlparse

* INCR-460: Fixes for useless suppression
 2019-07-16 14:28:03 -04:00
Amit
0c513e2139 INCR-449: Make compatible with Python 3.x (#21100) 
* INCR-449: Make compatible with Python 3.x

* INCR-449: Fixes for line long
 2019-07-16 10:41:06 -04:00
Brittney Exline
d3f0b3dc7b Merge pull request #21132 from edx/bexline/fix_dependencies 
Fixing dependency issues so that make upgrade can run
 2019-07-16 08:37:18 -06:00
muhammad-ammar
cee2359141 pin edx-search==1.2.2 2019-07-16 19:06:19 +05:00
muhammad-ammar
67e69b9030 use edx-enterprise pkg instead of branch and then do make upgrade 2019-07-16 17:34:21 +05:00
Brittney Exline
2b8cb8cf9b Fixing dependency issues so that make upgrade can run 2019-07-16 17:34:20 +05:00
aarif
cdfee4348f ran python-modernize and isort on files mentioned in INCR-367 
changes made to comply with pylint
 2019-07-16 09:58:17 +00:00