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

3936 Commits

Author SHA1 Message Date
Ayub
c5a61541ab Merge pull request #21949 from edx/BOM-894 
BOM-894 python3 order mismatch
 2019-10-10 10:22:57 +05:00
jinder1s
93dcd26118 quality fixes 2019-10-09 09:30:52 -04:00
jinder1s
d8b7a2e1fe quality fixes 2019-10-09 08:53:22 -04:00
jinder1s
075faede22 Modifying test to work in both py2 and 3 2019-10-09 08:53:22 -04:00
Manjinder Singh
00348ec0a9 Merge pull request #21898 from edx/msingh/python3_test_views_py 
BOM-749: Explicity creating byte strings
 2019-10-09 08:52:06 -04:00
aarif
91bed37922 Updated the expected error message to get assertion successful for both python versions 
changes made as suggested
 2019-10-09 16:03:50 +05:00
Aarif
6a2f3d6dbc Merge pull request #21866 from edx/BOM-831 
Updated the string input to md5 to make output compatible with both python versions - BOM-831
 2019-10-09 15:40:33 +05:00
Ayub khan
298fbdaec2 BOM-894 python3 order mismatch 
Python3 arguments have different positions as compared to python2
 2019-10-09 15:06:27 +05:00
Aarif
97452b31ae Merge pull request #21881 from edx/BOM-873 
Updated the division operation to make the output compatible with both python versions - BOM-873
 2019-10-08 13:41:15 +05:00
Braden MacDonald
b7d1827017 Fix minor unicode OLX bug 2019-10-07 16:43:47 -04:00
jinder1s
2c6b2f32dd converting unicode to byte where necessary 2019-10-04 11:13:11 -04:00
Calen Pennington
9a800fb180 Downgrade content-highlights mismatches to warnings, and add the course-key to the error message 2019-10-04 10:35:03 -04:00
Ayub
0b82a59db4 Merge pull request #21925 from edx/BOM-893 
BOM-893
 2019-10-04 11:23:40 +05:00
Manjinder Singh
2213f524cf Merge pull request #21899 from edx/msingh/python3_test_parser_py 
BOM-749: Explicity creating byte strings
 2019-10-03 11:57:15 -04:00
Ayub khan
09843b993c BOM-893 
python3 compatibility: regex needs bytes type strings to check bytes type response
 2019-10-03 15:54:04 +05:00
Aarif
8cf25ea81a Merge pull request #21883 from edx/BOM-874 
Updated the division operation to make the output compatible with both python versions - BOM-874
 2019-10-03 12:40:19 +05:00
Feanil Patel
59ae37b3ba Merge pull request #21903 from edx/feanil/fix_date_mock 
Fix datetime mock to only mock the now function.
 2019-10-02 09:44:57 -04:00
Diana Huang
5e5c857208 Merge pull request #21902 from edx/diana/annotate-toggles 
Annotate a few of the course_experience waffle flags.
 2019-10-02 09:36:54 -04:00
Adeel Khan
f11afb57a2 Adds migration for simulate publish command 
A rewording of help text caused django to create
a new migration for config model and that was not
initially pushed to master.
 2019-10-02 14:45:43 +05:00
aarif
86c7b9f809 updated the division operation to make the output compatible in python 2 and python 3 
changes made to fix quality errors

changes made to fix issues on BOM-587

minor changes made to fix quality issues

minor changes

removed unused pylint supression
 2019-10-02 14:01:08 +05:00
aarif
e6470fb970 python 3 fixes 
changes made to fix quality errors

changes made to fix quality errors

minor changes
 2019-10-02 12:13:45 +05:00
Feanil Patel
3132982141 Fix datetime mock to only mock the now function. 2019-10-01 16:17:45 -04:00
Diana Huang
ff795347dd Annotate a few of the course_experience waffle flags. 2019-10-01 16:03:36 -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
jinder1s
3dc35dc09c Explicity creating byte strings 2019-10-01 13:43:45 -04:00
aarif
b7ee87caba updated the division to make the output compatible in python2 and python3 2019-10-01 13:27:32 +05:00
Aarif
bc6821ce53 Merge pull request #21810 from edx/BOM-745 
BOM-745
 2019-10-01 11:58:09 +05:00
Ayub
df066afdf7 Merge pull request #21848 from edx/BOM-882 
BOM-881, BOM-882
 2019-10-01 10:39:53 +05:00
aarif
df2686dc63 updated input to md5 method to properly hash the input in both python versions 2019-09-30 19:55:15 +05: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
ccefde8d3c Python-3: assertNotIn(..response.content) -> assertNotContains 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
Nimisha Asthagiri
95c2e49438 Merge pull request #21840 from edx/bom/block-structure-python-3 
block_structure python-3 upgrade
 2019-09-30 08:33:32 -04:00
Nimisha Asthagiri
468f1ad393 Merge pull request #21839 from edx/bom/course-overviews-python-3 
course_overviews python-3 upgrade
 2019-09-30 08:33:17 -04:00
Nimisha Asthagiri
4589e05215 Merge pull request #21838 from edx/bom/api-admin-python-3 
api_admin python-3 upgrade
 2019-09-30 08:32:54 -04:00
Ayub khan
86bd5a4643 BOM-881 
python3 compatibility
 2019-09-30 14:58:12 +05:00
Ayub khan
cc4050460e BOM-882 
python3 compatibility
 2019-09-30 14:42:55 +05:00
Aarif
7eee466c68 Merge pull request #21815 from edx/BOM-747 
BOM-747
 2019-09-30 12:59:46 +05:00
Aarif
d7d02b9802 Merge pull request #21808 from edx/BOM-744 
BOM-744
 2019-09-30 12:57:41 +05:00
Aarif
473398d410 Merge pull request #21792 from edx/BOM-743 
BOM-743
 2019-09-30 12:57:07 +05:00
Nimisha Asthagiri
b0a1a99aa6 block_structure python-3 upgrade 2019-09-28 14:15:24 -04:00
Nimisha Asthagiri
ea0bea8193 course_overviews python-3 upgrade 2019-09-28 14:00:14 -04:00
Nimisha Asthagiri
7c211a5843 api_admin python-3 upgrade 2019-09-28 12:54:34 -04:00
Jeremy Bowman
ead81288ad Always store transformers_schema_version as text BOM-576 (#21823) 2019-09-27 14:33:25 -04:00
Stu Young
7c6c166e73 fix toggle implementation annotations (#21802) 
fix toggle implementation annotations and rename waffle flags
 2019-09-27 11:45:40 -04:00
Jeremy Bowman
88b8e97409 Fix block_structure error handling BOM-577 (#21801) 2019-09-27 10:06:00 -04:00
Matthew Piatetsky
c7c4f6073d Merge pull request #21798 from edx/PROD-713 
show graded content block without the upsell when the upgrade deadline is expired
 2019-09-27 09:54:26 -04:00
aarif
14f7990b3e python 3 fixes 2019-09-27 18:05:05 +05:00
Hassan Javeed
8ad77f7f0c Removed one-off management commands. 2019-09-27 18:04:16 +05:00