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

51667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinder1s
e727ded167 Explicitly setting string to byte 2019-09-30 09:37:06 -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
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
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
Nimisha Asthagiri
e5c258948d third_party_auth python-3 upgrade 2019-09-28 12:42:51 -04:00
Nimisha Asthagiri
b73e0d8120 Grades python-3 upgrade: test_recalculate_learner_grades.py 2019-09-28 11:39:26 -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
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
Jeremy Bowman
ead81288ad Always store transformers_schema_version as text BOM-576 (#21823) 2019-09-27 14:33:25 -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
Simon Chen
59168c75af upgrade proctoring library 2019-09-27 13:32:48 -04:00
Alex Dusenbery
bf77974297 EDUCATOR-4684 | The instructor course grade report should take subsection grade overrides into account. 2019-09-27 11:55:41 -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
Matt Hughes
6085852c99 Attribute grade overrides from proctoring to the final reviewer 
More generally, makes it so we don't ever pull in the user to whom
we're attributing overrides from the request, but always use the one
passed in via method parameters

Also pass through comments, if they're provided via this method

JIRA:EDUCATOR-4641
 2019-09-27 10:58:58 -04:00
Jeremy Bowman
6f3e1e7e3d Fix remaining pavelib test failures BOM-598 (#21819) 2019-09-27 10:52:22 -04:00
Jeremy Bowman
88b8e97409 Fix block_structure error handling BOM-577 (#21801) 2019-09-27 10:06:00 -04:00
edX requirements bot
a91fcfceed Updating Python Requirements (#21807) 2019-09-27 10:04:44 -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
Hassan
41c8477b62 Merge pull request #21813 from edx/hassan/remove-management-commands 
Removed one-off management commands.
 2019-09-27 18:53:54 +05:00
aarif
4e0ca7c381 python 3 fixes 2019-09-27 18:43:46 +05: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
Ben Holt
2d215cccb8 REV-935 More upsell API tests (#21765) 
Check course start and end dates, better test coverage
 2019-09-27 08:57:27 -04: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
Awais Qureshi
2df263662b Merge pull request #21726 from edx/awais786/BOM-627 
BOM-627
 2019-09-27 16:20:19 +05:00
Awais Qureshi
b48fe6162e Merge pull request #21730 from edx/awais786/BOM-729 
BOM-729
 2019-09-27 16:07:16 +05:00
aarif
13afdbb84c python 3 fixes 
minor changes
 2019-09-27 15:59:03 +05:00
Syed Muhammad Dawoud Sheraz Ali
47f8735078 Merge pull request #21617 from edx/dsheraz/prod-62 
Add transformer for re-writing video urls in course api
 2019-09-27 15:43:43 +05:00