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

51654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Aarif
2dee4dff37 Merge pull request #21747 from edx/BOM-595 
BOM-595
 2019-09-27 14:51:21 +05:00
Aarif
56ee4e0222 Merge pull request #21791 from edx/BOM-742 
BOM-742
 2019-09-27 14:49:45 +05:00
Aarif
889445a2fd Merge pull request #21790 from edx/BOM-741 
BOM-741
 2019-09-27 14:49:23 +05:00
Aarif
5597a86a6b Merge pull request #21773 from edx/BOM-739 
BOM-739
 2019-09-27 14:47:50 +05:00
Aarif
177b8ab60a Merge pull request #21623 from edx/BOM-421 
BOM-421
 2019-09-27 14:46:35 +05:00
DawoudSheraz
942c79e606 add video url transformer 2019-09-27 14:26:52 +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
93386c8947 Merge pull request #21786 from edx/BOM-671 
BOM-671
 2019-09-27 09:45:45 +05:00
Ayub
290caa4c8e Merge pull request #21788 from edx/BOM-612 
BOM-612
 2019-09-27 09:44:44 +05:00
Matthew Piatetsky
0c03138229 show graded content block without the upsell when the upgrade deadline is expired 2019-09-26 17:49:08 -04: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
Andytr1
a375ce4aac Merge pull request #21799 from edx/andytr1/get_history-from-simple 
EDUCATOR-4696 readded get_history
 2019-09-26 14:59:44 -04:00