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

17407 Commits

Author SHA1 Message Date
Aarif
9a8f0cee1d Merge pull request #21894 from edx/BOM-802 
Updated the comparison operation to calculate MongoDB's connection version - BOM-802
 2019-10-07 12:22:30 +05:00
Calen Pennington
5734e79b5d Use absolute paths to upload files in more bokchoy tests 2019-10-04 10:10:11 -04:00
Ayub
42ec910e07 Merge pull request #21922 from edx/BOM-788 
BOM-788
 2019-10-04 15:07:36 +05:00
Chris Pappas
69bb6b582b ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2… (#21916) 
* ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2.0.0 (and 1.11.0)

* Skipping db_migration test for first part of removal of enterprisecustomerentitlements
 2019-10-03 16:55:55 -04:00
Stu Young
31859fb930 remove flaky test (#21871) 2019-10-03 09:57:50 -04:00
Ayub khan
277afeb85e BOM-788 
python3 compatibility: etree returns a bytes type string so in py3 we need to decode it
to compare with a unicode string
 2019-10-03 15:26:36 +05:00
edX Transifex Bot
df6f54da9a geoip2: update maxmind geolite country database 2019-10-02 17:03:28 -04:00
Diana Huang
abf77b1ae1 Drop notes tables. 2019-10-02 14:11:15 -04:00
Feanil Patel
cf989502a1 Merge pull request #21830 from edx/jmbowman/BOM-774 
Fix deprecated drag and drop grading BOM-774
 2019-10-02 10:58:10 -04:00
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
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
8e0f90045a Use absolute paths to upload files in video tests 2019-10-01 13:04:58 -04:00
Ayub
27aa7e4abf Merge pull request #21806 from edx/BOM-609 
BOM-609
 2019-10-01 12:10:38 +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
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
Stu Young
eeb3afd8cc remove flaky test (#21834) 2019-09-30 14:10:56 -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
8cfc33c0f1 Python 3: multi-line regex replacement of assertIn and assertNotIn 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
d6d9a17e67 student app: python-3 upgrade 2019-09-30 08:44:54 -04:00
Nimisha Asthagiri
f8e70bc484 Merge pull request #21837 from edx/bom/third-party-auth-python-3 
third_party_auth python-3 upgrade
 2019-09-30 08:32:41 -04:00
Ayub khan
9dc5866464 BOM-823 
python3 compatibility
 2019-09-30 16:12:32 +05:00
Ayub khan
3ae2e44af4 BOM-807 
python3 compatibility
 2019-09-30 16:04:00 +05:00
Ayub khan
73a453d3c2 BOM-842 2019-09-30 15:59:36 +05:00
Ayub khan
b83d6adb5a BOM-812 
python3 compatibility
 2019-09-30 15:20:20 +05:00
Ayub khan
c56de3d37d BOM-806 
python3 compatibility
 2019-09-30 15:11:07 +05:00
Aarif
e7dadeb26c Merge pull request #21818 from edx/BOM-748 
BOM-748
 2019-09-30 13:00:43 +05:00
Aarif
d11ce42c78 Merge pull request #21812 from edx/BOM-746 
BOM-746
 2019-09-30 12:58:47 +05:00
Ayub khan
a21604afdb BOM-613 
Made all tests py3 compatible.
 2019-09-30 12:07:49 +05:00
Ayub
12140e5b78 Merge pull request #21784 from edx/BOM-608 
BOM-608
 2019-09-30 10:34:58 +05:00
Nimisha Asthagiri
e5c258948d third_party_auth python-3 upgrade 2019-09-28 12:42:51 -04:00
Stu Young
50cd2ec409 remove flaky test (#21827) 2019-09-27 16:42:17 -04:00
Feanil Patel
b26d1050a5 Merge pull request #21825 from edx/feanil/fix_error_validation 
Explicitly set the test string to unicode.
 2019-09-27 15:55:01 -04:00
Feanil Patel
d5496ee0cb Merge pull request #21826 from edx/feanil/fix_exception_reraise 
BOM-843 Fix reraise call.
 2019-09-27 15:54:46 -04:00
Jeremy Bowman
e93b3a9a31 Fix deprecated drag and drop grading BOM-774 2019-09-27 15:29:04 -04:00
Matt Hughes
6206ec80b7 Delete flaky test test_comment_deletion_as_student 
This test has been flaky in the past; I turned up TNLARCHIVE-530 and
TNLARCHIVE-2147 in JIRA while verifying no one else had actually
gotten it.
 2019-09-27 15:18:58 -04:00
Stu Young
55357f524e remove flaky test (#21822) 2019-09-27 14:49:30 -04:00
Feanil Patel
07df64eb8c Fix the rest of these. 2019-09-27 14:36:40 -04:00
Feanil Patel
16cce5f389 BOM-843 Fix reraise call. 2019-09-27 14:19:40 -04:00
Feanil Patel
a4447da5e0 Explicitly set the test string to unicode. 2019-09-27 14:06:49 -04:00
aarif
4e0ca7c381 python 3 fixes 2019-09-27 18:43:46 +05:00
aarif
d832c21a20 python 3 fixes 2019-09-27 17:17:15 +05:00
Awais Qureshi
22d5273994 Merge pull request #21754 from edx/awais786/BOM-593 
BOM-593
 2019-09-27 16:22:20 +05:00
Aarif
56ee4e0222 Merge pull request #21791 from edx/BOM-742 
BOM-742
 2019-09-27 14:49:45 +05:00
Awais Jibran
007dfa5c55 Merge pull request #21750 from edx/aj/prevent-unicode-error 
Prevent unicode error
 2019-09-27 13:25:10 +05:00