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

51699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ayub
cb926b65af Merge pull request #21858 from edx/BOM-823 
BOM-823
 2019-10-01 10:35:49 +05: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
Stu Young
8c94ee15ea add missing annotation tokens to course api toggles (#21831) 2019-09-30 14:13:03 -04:00
Stu Young
eeb3afd8cc remove flaky test (#21834) 2019-09-30 14:10:56 -04:00
Awais Qureshi
647527f916 Merge pull request #21852 from edx/awais786/BOM-829 
BOM-829
 2019-09-30 22:26:54 +05:00
Awais Qureshi
59cdc80159 Merge pull request #21847 from edx/awais786/BOM-841 
BOM-841
 2019-09-30 22:24:26 +05:00
Michael Terry
4565323c7c Merge pull request #21869 from edx/mikix/show-expired-vud 
Show expired VUD in Studio
 2019-09-30 12:19:42 -04:00
Michael Terry
e4617f0dde Show expired VUD in Studio 
If the verified mode has expired, we still want to show its
upgrade deadline in Studio settings.
 2019-09-30 11:49:06 -04:00
Manjinder Singh
6e2c5f0044 Merge pull request #21867 from edx/msingh/python3_certificates 
BOM-749: Fixing error in test_certificates.py
 2019-09-30 11:44:44 -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
c05d469a62 Fixing conditional 2019-09-30 11:12:36 -04:00
Feanil Patel
e10e743dbc Merge pull request #21844 from amitvadhel/BOM-890 
Python3 division: two integers and get a float | BOM-890
 2019-09-30 11:08:48 -04:00
jinder1s
61f6dabdcf correctly decoding bytes to utf-8 2019-09-30 11:01:31 -04:00
Feanil Patel
a96fcff92c Merge pull request #21854 from edx/jenkins/upgrade-python-requirements-840b5da 
Python Requirements Update
 2019-09-30 10:01:09 -04:00
jinder1s
e727ded167 Explicitly setting string to byte 2019-09-30 09:37:06 -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
f18f72d6fb Merge pull request #21842 from edx/bom/regex-python-3 
Python 3: Regex bulk changes
 2019-09-30 09:24:01 -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
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
bb419b485d Python 3: assertEqual(response.content.count -> assertContains(.. 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
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
d6d9a17e67 student app: python-3 upgrade 2019-09-30 08:44:54 -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
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
Nimisha Asthagiri
adaf79ff73 Merge pull request #21836 from edx/bom/grades-python-3 
Grades python-3 upgrade: test_recalculate_learner_grades.py
 2019-09-30 08:30:07 -04:00
Ayub khan
9dc5866464 BOM-823 
python3 compatibility
 2019-09-30 16:12:32 +05:00
edX requirements bot
86c3843105 Updating Python Requirements 2019-09-30 06:55:44 -04:00
Awais Qureshi
c96c172b3a BOM-829 
Python3 fix.
 2019-09-30 15:23:03 +05:00
Awais Qureshi
5c8db66021 BOM-841 
Python3 fix.
 2019-09-30 13:47:50 +05:00
Awais Qureshi
840b5da13d Merge pull request #21814 from edx/awais786/BOM-529 
BOM-529
 2019-09-30 13:13:00 +05:00
Aarif
e7dadeb26c Merge pull request #21818 from edx/BOM-748 
BOM-748
 2019-09-30 13:00:43 +05:00
Aarif
7eee466c68 Merge pull request #21815 from edx/BOM-747 
BOM-747
 2019-09-30 12:59:46 +05:00
Aarif
d11ce42c78 Merge pull request #21812 from edx/BOM-746 
BOM-746
 2019-09-30 12:58:47 +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
Zainab Amir
b4ca12af33 Notes css is missing for tab pages (#21846) 
style-student-notes is only added in courseware.html but it is missing
for custom tab pages.

PROD-687
 2019-09-30 12:44:10 +05:00
Awais Qureshi
0e095a96ad Merge pull request #21728 from edx/awais786/BOM-641 
BOM-641
 2019-09-30 12:12:33 +05:00
Awais Qureshi
9b39f91599 BOM-529 
Python3 fix.
 2019-09-30 12:02:54 +05:00
Ayub
12140e5b78 Merge pull request #21784 from edx/BOM-608 
BOM-608
 2019-09-30 10:34:58 +05:00
edX Transifex Bot
a9d4f3c972 fix(i18n): update translations 2019-09-29 17:17:43 -04:00
amitvadhel
e0251da989 Fix for Python3 division 2019-09-29 16:39:22 +03:00
AmiT
4fd8b81e29 Merge pull request #4 from edx/master 
Syncing a fork
 2019-09-29 14:57:08 +05:30
Nimisha Asthagiri
b0a1a99aa6 block_structure python-3 upgrade 2019-09-28 14:15:24 -04:00