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

597 Commits

Author SHA1 Message Date
Jeff LaJoie
fa3b1cd835 AA-6: Adds in dates tab and dates dashboard view to courseware 2020-02-25 10:48:45 -05:00
aarif
79bf089406 updated the django-waffle to support django 2.2 
made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

ran make upgrade

updated the django-waffle to support django 2.2

made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

removed the pdb statements

ran make upgrade
 2020-01-08 14:11:42 +05:00
Feanil Patel
046feb0cf0 Merge pull request #22649 from edx/feanil/fix_pep8 
Fix all E303 pep8 errors.
 2019-12-30 13:32:26 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts 
Run `2to3 -f asserts . -w` on edx-platform.
 2019-12-30 12:13:42 -05:00
Feanil Patel
39d3a7ca17 Fix pep8 issues caused by the fixer. 2019-12-30 11:42:04 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w 
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
 2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform. 
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
 2019-12-30 10:22:19 -05:00
DawoudSheraz
e306bc74c0 avoid pretty printing of pre tags in course import 2019-11-12 13:57:25 +05:00
Dave St.Germain
3e73ba3879 TNL-6929: 
Improves navigation within Studio for Learning Sequences, speeding up authors who want to see how a learner progresses through content without needing to jump over to the LMS.

This adds a dropdown section navigator to the breadcrumbs on the unit page and copies the sequence navigator from LMS to the studio unit page.
 2019-11-07 09:13:00 -05:00
Awais Qureshi
3d58a0ded8 BOM-932 
Fixing byte issues.
 2019-10-17 17:05:13 +05:00
Feanil Patel
c9895477fd Import binary files an byte arrays. 2019-10-07 13:49:25 -04:00
Feanil Patel
ef27928e67 Decode content from django test client. 2019-10-07 13:49:25 -04:00
Feanil Patel
66382961a7 Fix all transcript related tests. 
Treat transcript content as unicode strings and convert them at any edge
where we encounter them.  One decision made here was to not update
edx-val it treats transcripts as byte but is much closer to the actual
files so it makes more sense over there. But within the platform they
are generally passed around as serialized json and so it's much better
for them to be unicode.
 2019-10-07 13:49:25 -04: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
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
e727ded167 Explicitly setting string to byte 2019-09-30 09:37:06 -04:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 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
a6b219a9e9 Python-3: assertIn(..response.content) -> assertContains 2019-09-30 08:50:38 -04:00
aarif
07b5c954b0 python 3 fixes 
test fixes

python 3 fixes

minor fixes

python 3 fixes

quality fixes

quality fixes
 2019-09-24 12:01:02 +05:00
Ayub khan
6f1d379a0f BOM-376 
python3 compatibility fixes all tests
 2019-09-20 16:01:06 +05:00
aarif
cde8a2a62a python 3 fixes 
changes made as suggested

minor change

changes made as suggested

test fixes for python 2

removed debug statement

quality fixes

quality fix

quality fix
 2019-09-16 13:13:45 +05:00
Aarif
c3e866cc28 Merge pull request #21577 from edx/BOM-377 
BOM-377
 2019-09-11 15:18:07 +05:00
Ayub
bcad9519bc Merge pull request #21528 from edx/BOM-398 
BOM-398
 2019-09-11 12:29:24 +05:00
Awais Qureshi
b8b6dc4883 PROD-662 
Photo verification Fixing python3
 2019-09-08 20:35:52 +05:00
aarif
e7a9e4cf1f python 3 fixes 2019-09-05 17:19:41 +05:00
Awais Qureshi
6b50e12b0e BOM-364 
python3 tests failures.
 2019-09-04 17:51:26 +05:00
Ayub
667b7cf2ca Merge pull request #21459 from edx/BOM-357 
BOM-357
 2019-09-04 11:22:22 +05:00
Ayub
3a5e58e6a8 Merge pull request #21535 from edx/BOM-361 
BOM-361
 2019-09-04 11:08:52 +05:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Ayub khan
506736b03e BOM-361 
py3 unittest fix
 2019-09-03 16:44:49 +05:00
Ayub khan
6b884c98b6 BOM-370 
py3 unittest fix
 2019-09-03 16:06:48 +05:00
Ayub khan
0dc180ddc3 BOM-398 
py3 combatibility - test fix
 2019-09-03 13:45:15 +05:00
Ayub khan
136bdf8c0f BOM-357 
Fix failing test
 2019-08-27 15:50:05 +05:00
Awais Qureshi
5dc63a9aab Merge pull request #21405 from edx/awais786/BOM-399 
BOM-399
 2019-08-26 11:03:07 +05:00
Awais Qureshi
766d9fb649 Merge pull request #21408 from edx/awais786/BOM-388 
BOM-388
 2019-08-22 20:42:03 +05:00
arbisoft
04536e5c5f BOM-388 
Fixing list len issue.
 2019-08-22 16:22:58 +05:00
arbisoft
e140d4aa93 BOM-396 
Fixing encode/decode issues for python3.
 2019-08-22 15:43:23 +05:00
arbisoft
933a55d92e BOM-399 
Fixing encode/decode issues for python3.
 2019-08-22 15:35:01 +05:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
aarif
61800c619f replaced StringIO imports with import from six 
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
 2019-08-08 00:09:16 +05:00
Feanil Patel
18e988b747 Fix some minor issues that prevent some tests from being collected. 2019-08-06 15:19:55 -04:00
David Ormsbee
b3614f3a00 Merge pull request #20954 from open-craft/symbolist/html-block 
HtmlModule to HtmlBlock [SE-1089]
 2019-08-01 11:36:23 -04:00