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

51733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aarif
c7a05ecf77 Updated the comparison operation to properly calculate mongo connection version 
minor changes made to fix quality issues

changes made as suggested

removed unused import statement
 2019-10-02 13:41:19 +05:00
Aarif
7be6acb880 Merge pull request #21856 from edx/BOM-851 
BOM-851
 2019-10-02 11:44:45 +05:00
Ned Batchelder
0fb36bf549 Merge pull request #21904 from edx/nedbat/revert-fancy-stacktrace 
See if this fancy stack trace was stopping newrelic
 2019-10-01 19:37:12 -04:00
Ned Batchelder
d3a1ca9f69 See if this fancy stack trace was stopping newrelic 2019-10-01 18:04:16 -04:00
David J. Malan
680f62278c AccessTokenView: support for X-Token-Type in HTTP header (#21662) 
* AccessTokenView: support for X-Token-Type in HTTP header
 2019-10-01 15:57:21 -04:00
Calen Pennington
62300b922c Merge pull request #21897 from cpennington/absolute-path-bokchoy-uploads 
Use absolute paths to upload files in video tests
 2019-10-01 14:57:06 -04:00
Calen Pennington
b70d8e68c5 Merge pull request #21870 from cpennington/upgrade-edx-lint 
Upgrade edx-lint
 2019-10-01 14:56:20 -04:00
Feanil Patel
3dd8decd23 Merge pull request #21888 from edx/jenkins/upgrade-python-requirements-27aa7e4 
Python Requirements Update
 2019-10-01 14:01:47 -04:00
Calen Pennington
2fa5ff0067 TEST: increase the timeout on the linting jobs 2019-10-01 14:00:54 -04:00
Calen Pennington
86be8d124a Upgrade edx-lint 2019-10-01 14:00:54 -04:00
Calen Pennington
8e0f90045a Use absolute paths to upload files in video tests 2019-10-01 13:04:58 -04:00
irfanuddinahmad
657d533efe Merge pull request #21896 from edx/iahmad/ENT-2223-Version-upgrade-for-edx-enterprise 
ENT-2223: Version upgrade for edx-enterprise
 2019-10-01 20:06:27 +05:00
root
a9564a622d Version upgrade for edx-enterprise 2019-10-01 14:18:28 +00:00
edX requirements bot
881861346d Updating Python Requirements 2019-10-01 06:48:26 -04:00
Ayub
27aa7e4abf Merge pull request #21806 from edx/BOM-609 
BOM-609
 2019-10-01 12:10:38 +05:00
Ayub
f4ca2035f9 Merge pull request #21861 from edx/BOM-850 
BOM-850
 2019-10-01 12:00:06 +05:00
Aarif
bc6821ce53 Merge pull request #21810 from edx/BOM-745 
BOM-745
 2019-10-01 11:58:09 +05:00
Ayub khan
b5dc95a30d BOM-609 
python3 compatibility
 2019-10-01 11:33:37 +05:00
Ayub khan
c29b7520a1 BOM-850 
python3 compatibility
 2019-10-01 10:56:00 +05:00
Ayub
2de3667c85 Merge pull request #21804 from edx/BOM-613 
BOM-613
 2019-10-01 10:41:31 +05:00
Ayub
df066afdf7 Merge pull request #21848 from edx/BOM-882 
BOM-881, BOM-882
 2019-10-01 10:39:53 +05:00
Ayub
58b43cafd0 Merge pull request #21850 from edx/BOM-806 
BOM-806
 2019-10-01 10:38:53 +05:00
Ayub
c02678a2d0 Merge pull request #21851 from edx/BOM-812 
BOM-812
 2019-10-01 10:37:48 +05:00
Ayub
ac3718055a Merge pull request #21855 from edx/BOM-842 
BOM-842
 2019-10-01 10:37:15 +05:00
Ayub
42b6aa977c Merge pull request #21857 from edx/BOM-807 
BOM-807
 2019-10-01 10:36:39 +05:00
Ayub
cb926b65af Merge pull request #21858 from edx/BOM-823 
BOM-823
 2019-10-01 10:35:49 +05:00
Manjinder Singh
341360ada1 Merge pull request #21868 from edx/msingh/python3_test_course_index_py 
BOM-749: Fixing error in test_course_Index
 2019-09-30 15:04:10 -04:00
Stu Young
8c94ee15ea add missing annotation tokens to course api toggles (#21831) 2019-09-30 14:13:03 -04:00
Stu Young
eeb3afd8cc remove flaky test (#21834) 2019-09-30 14:10:56 -04:00
Awais Qureshi
647527f916 Merge pull request #21852 from edx/awais786/BOM-829 
BOM-829
 2019-09-30 22:26:54 +05:00
Awais Qureshi
59cdc80159 Merge pull request #21847 from edx/awais786/BOM-841 
BOM-841
 2019-09-30 22:24:26 +05:00
Michael Terry
4565323c7c Merge pull request #21869 from edx/mikix/show-expired-vud 
Show expired VUD in Studio
 2019-09-30 12:19:42 -04:00
Michael Terry
e4617f0dde Show expired VUD in Studio 
If the verified mode has expired, we still want to show its
upgrade deadline in Studio settings.
 2019-09-30 11:49:06 -04:00
Manjinder Singh
6e2c5f0044 Merge pull request #21867 from edx/msingh/python3_certificates 
BOM-749: Fixing error in test_certificates.py
 2019-09-30 11:44:44 -04:00
Manjinder Singh
139d1330da Merge pull request #21864 from edx/msingh/type_error2 
BOM-749: Fixing error in test_assets.py
 2019-09-30 11:44:21 -04:00
jinder1s
9ac5a0b76a explicitly set value byte 2019-09-30 11:25:53 -04:00
jinder1s
c05d469a62 Fixing conditional 2019-09-30 11:12:36 -04:00
Feanil Patel
e10e743dbc Merge pull request #21844 from amitvadhel/BOM-890 
Python3 division: two integers and get a float | BOM-890
 2019-09-30 11:08:48 -04:00
jinder1s
61f6dabdcf correctly decoding bytes to utf-8 2019-09-30 11:01:31 -04:00
Feanil Patel
a96fcff92c Merge pull request #21854 from edx/jenkins/upgrade-python-requirements-840b5da 
Python Requirements Update
 2019-09-30 10:01:09 -04:00
jinder1s
e727ded167 Explicitly setting string to byte 2019-09-30 09:37:06 -04:00
Nimisha Asthagiri
ea17b5942a Merge pull request #21841 from edx/bom/student-python-3 
student app: python-3 upgrade
 2019-09-30 09:24:25 -04:00
Nimisha Asthagiri
f18f72d6fb Merge pull request #21842 from edx/bom/regex-python-3 
Python 3: Regex bulk changes
 2019-09-30 09:24:01 -04:00
Nimisha Asthagiri
8cfc33c0f1 Python 3: multi-line regex replacement of assertIn and assertNotIn 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
bb419b485d Python 3: assertEqual(response.content.count -> assertContains(.. 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
9bbc21ea8c Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
beb95eb69c Python 3: assertIn -> assertContains consistency 2019-09-30 08:51:01 -04:00
Nimisha Asthagiri
d4832a65aa Python 3: assertNotIn -> assertNotContains consistency 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
ccefde8d3c Python-3: assertNotIn(..response.content) -> assertNotContains 2019-09-30 08:50:38 -04:00