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

50455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
2234aeb1ab Coverage et al that support who-tests-what 2019-07-22 16:24:55 -04:00
Ned Batchelder
12ca7b8ab7 Name coverage data files so they won't overwrite each other. 2019-07-20 12:21:05 -04:00
Ned Batchelder
c8c39c613d Merge pull request #21170 from edx/nedbat/pin-pip-tools 
Pin pip-tools==3.8.0 because of bugs
 2019-07-19 14:43:53 -04:00
Feanil Patel
ecce0d0c96 Merge pull request #21169 from edx/renovate/backbone.paginator-2.x 
Update dependency backbone.paginator to v2.0.8
 2019-07-19 14:23:28 -04:00
Ned Batchelder
1ec0486553 Pin pip-tools because of bugs 2019-07-19 13:59:43 -04:00
Feanil Patel
c522a59197 Make lock file be from npm 5.5.1 2019-07-19 13:33:40 -04:00
Renovate Bot
87602843ff Update dependency backbone.paginator to v2.0.8 2019-07-19 15:57:32 +00:00
Feanil Patel
38c7644112 Merge pull request #21153 from edx/renovate/backbone-1.x 
Update dependency backbone to v1.4.0
 2019-07-19 11:55:32 -04:00
Farhanah Sheets
7385841c4b Merge pull request #21135 from edx/waheed/PROD-478-move-sso-button 
Move secondary SSO login button.
 2019-07-19 11:30:35 -04:00
Feanil Patel
4ee06bc49e Run with our older version of npm. 2019-07-19 11:23:48 -04:00
Christie Rice
fee8e17f95 REVMI-341 Stop sending lms_client_id in jwt sent to ecommerce (#21167) 2019-07-19 10:46:46 -04:00
Feanil Patel
7ae8221a47 Merge pull request #21055 from amitvadhel/INCR-411 
INCR-411: Updates on Python 3.x
 2019-07-19 10:18:04 -04:00
aarif
ccff822a28 ran python-modernize and isort on files mentioned in INCR-396 2019-07-19 10:04:05 -04:00
Ayub khan
83bc838fae python 3 compatibility 2019-07-19 10:02:38 -04:00
Ayub khan
33bcb76a26 INCR-400 python3 compatibility 2019-07-19 10:00:39 -04:00
Ayub khan
3a04fbd37a INCR-440 python3 compatibility 2019-07-19 09:54:52 -04:00
Ayub khan
99060623ac INCR-442 python3 compatibility 2019-07-19 09:53:01 -04:00
Feanil Patel
b94b211c29 In python3 force_unicode is renamed to force_text. 2019-07-19 09:48:10 -04:00
Feanil Patel
d1556fc86d md5 needs bytes in python 3 but a sting is fine in python2. 2019-07-19 09:48:10 -04:00
Feanil Patel
d9c9d7bab9 Deal with NoneType access. 
The `NoneType` object is not available from the `types` module in
python 3. This is a workaronud to deal with that.
 2019-07-19 09:48:10 -04:00
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
amitvadhel
7d05a9666a INCR-411: Disable python-wrap-html for xss-lint 2019-07-18 21:29:32 +03: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
Renovate Bot
2fe36667b4 Update dependency backbone to v1.4.0 2019-07-17 16:31:03 +00: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