Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
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
Ayub
290caa4c8e Merge pull request #21788 from edx/BOM-612 
BOM-612
 2019-09-27 09:44:44 +05:00
Jeremy Bowman
1e3d6f6db3 Fix parsing of Unicode capa XML BOM-611 (#21803) 2019-09-26 16:34:35 -04:00
Feanil Patel
a847620e88 Merge pull request #21797 from edx/feanil/fix_xmodule_format_failure 
Division changed in python3 to produce floats even when you divide tw…
 2019-09-26 15:49:25 -04:00
Ned Batchelder
b3845b2b96 Merge pull request #21581 from edx/nedbat/fix-courseware-warning 
Finally import courseware properly everywhere to get rid of a warning
 2019-09-26 14:25:27 -04:00
Jeremy Bowman
4babc5ee1c Fix CorruptGridFile in Python 3 tests BOM-375 (#21794) 2019-09-26 13:43:26 -04:00
Feanil Patel
093e5a543a Division changed in python3 to produce floats even when you divide two ints. 2019-09-26 13:23:15 -04:00
Manjinder Singh
61015ad840 Merge pull request #21779 from edx/msingh/python3_test_shuffle_custom_names 
BOM-614: AssertionError: Lists differ Fix.
 2019-09-26 13:13:53 -04:00
Waheed Ahmed
5d6a2ea022 Merge pull request #21787 from edx/waheed/PROD-454-use-order-date-attr-for-refund 
Use order date_placed enrollment attribute for refund.
 2019-09-26 21:20:27 +05:00
Ned Batchelder
58828da55b Fix patches to use proper courseware imports 2019-09-26 10:53:55 -04:00
Dave St.Germain
26026782b0 Merge pull request #21538 from edx/dcs/component-tweaks 
Studio Component Editor Tweaks
 2019-09-26 10:05:23 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
aarif
90b0130a55 python 3 fixes 2019-09-26 18:34:17 +05:00
Dave St.Germain
ea3232feac TNL-6920 Component Editor Efficiency Improvements 
* Enlarges component modal for easier editing
* Allows display name to be edited in place
* Improves markdown button labeling
* Moves markdown cheatsheet to the edit modal, for quick reference
 2019-09-26 09:34:14 -04:00
jinder1s
7a2aaa09c1 random.shuffle compatibility fix between python 2.7 and 3.5 2019-09-26 08:47:18 -04:00
Waheed Ahmed
68b5f98485 Save order date attribute and some refactoring. 
Save order placement date attribute so that we don't need to call
ecommerce again. Also did some refactoring.
 2019-09-26 17:46:14 +05:00
Ayub khan
476da01f36 BOM-612 
python3 compatibility
 2019-09-26 15:22:22 +05:00