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

9300 Commits

Author SHA1 Message Date
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
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
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
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
Jeremy Bowman
e93b3a9a31 Fix deprecated drag and drop grading BOM-774 2019-09-27 15:29:04 -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
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
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
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
Ayub khan
476da01f36 BOM-612 
python3 compatibility
 2019-09-26 15:22:22 +05:00
Aarif
37b08c5784 Merge pull request #21745 from edx/BOM-610 
BOM-610
 2019-09-26 12:35:24 +05:00
Ayub khan
1178384a52 BOM-608 
python3 compatibility
 2019-09-26 12:28:23 +05:00
Ayub
846a12939e Merge pull request #21735 from edx/BOM-update_str_method 
BOM Project __unicode__ to __str__
 2019-09-26 10:47:14 +05:00
Jeremy Bowman
dab59635a7 Fix some failing xmodule tests (#21775) 2019-09-25 12:01:27 -04:00
Jeremy Bowman
8828efc060 Fix test collection under py35 BOM-615 (#21774) 2019-09-25 11:20:21 -04:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
Aarif
4e95024dc3 Merge pull request #21525 from edx/BOM-367 
BOM-367 Python 3 fixes
 2019-09-25 16:07:44 +05:00
aarif
736001e7f1 python 3 fixes 
quality fixes

python 3 fixes
 2019-09-25 15:10:50 +05:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
Awais Jibran
c0e0318f08 Prevent unicode error 
This PR prevents `UnicodeDecodeError` when replacing unicode with bytes string.

Example:

PROD-680
 2019-09-24 13:12:40 +05:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2 
Python3 swarm 2
 2019-09-20 08:48:19 -04:00
Feanil Patel
9740e2e077 BOM-618 Don't decode string objects. 2019-09-19 14:14:23 -04:00
Jeremy Bowman
ae2c3b8edf Fix mocks of open() - BOM-597 2019-09-19 13:53:37 -04:00
Nicholas D'Alfonso
039b7aed29 DISCO-1342 hide fields 
hide course card image, course about page image, and course
display name when publisher flag is turned on
 2019-09-19 11:56:00 -04:00
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm 
Python3 swarm
 2019-09-19 10:23:04 -04:00
Feanil Patel
cb64fed1af BOM-489 Studio tests with byte/str mismatch. 2019-09-18 14:21:16 -04:00
Feanil Patel
ea49975a73 BOM-617 Fix test_static_replace test failures. 
Update the tests around static_file code to use byte streams instead of
string streams for generating static content.  This is a fix to get
these tests passing on python 3.
 2019-09-18 11:51:49 -04:00