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

50403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Awais Qureshi
c89ecb384f Merge pull request #21026 from edx/awais786/INCR-368 
INCR-368
 2019-07-16 12:57:22 +05:00
Ayub
31ab0bed32 Merge pull request #21016 from edx/INCR-349 
INCR-349 python3 compatibility
 2019-07-16 12:36:54 +05:00
Awais Qureshi
66b7fdae0d Merge pull request #21024 from edx/awais786/INCR-363 
INCR-363
 2019-07-16 12:01:00 +05:00
Awais Qureshi
46b089c12c Merge pull request #21021 from edx/awais786/INCR-357 
INCR-357
 2019-07-16 11:48:01 +05:00
Ayub
f7d0b54940 Merge pull request #21012 from edx/INCR-345 
INCR-345 python3 compatibility
 2019-07-16 11:40:33 +05:00
Ayub
cc07c7c97f Merge pull request #20991 from edx/INCR-336 
INCR-336 python3 compatibility
 2019-07-16 11:39:10 +05:00
Jillian Vogel
d3ce0b759e SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) (#21094) 
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-15 20:51:42 -04:00
Michael Roytman
ed602ab7ca Merge pull request #21129 from edx/mroytman/edx-proctoring-2.0.6 
update edx-proctoring package version to 2.0.6
 2019-07-15 15:18:12 -04:00
Amit
e96a789baf INCR-450: Make compatible with Python 3.x (#21097) 2019-07-15 11:57:37 -04:00
Michael Roytman
86eb5069e0 update edx-proctoring package version to 2.0.6 2019-07-15 10:42:39 -04:00
Muhammad Zaid Bamber
fa693d1aa0 Merge pull request #21090 from edx/zaid-prod-449 
Added logs for XQueue Information
 2019-07-15 18:12:10 +05:00
Ayub
ac0f7f8e20 Merge pull request #21127 from edx/revert-21014-INCR-343 
Revert "INCR-343 Python 3 compatibility"
 2019-07-15 17:04:20 +05:00
Ayub
1a9648a07e Revert "ran python-modernize and isort on files mentioned in INCR-343 (#21014)" 
This reverts commit 87e58c86cc.
 2019-07-15 16:44:13 +05:00
Awais Qureshi
bc542728b7 Merge pull request #21010 from edx/awais786/INCR-346 
INCR-346
 2019-07-15 15:54:48 +05:00
zaidbamber161
d4c41008b4 Updated logs information 2019-07-15 15:50:37 +05:00
zaidbamber161
f02b34c1a1 Updated logs information 2019-07-15 15:50:37 +05:00
zaidbamber161
f86d0c8e16 Fixed quality test 2019-07-15 15:50:37 +05:00